Merge branch 'backport' into work

[mikachu/openbox.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e937405..9e6bcb6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ po/remove-potcdate.sed
 render/obrender-4.0.pc
 obt/obt-4.0.pc
 tools/gnome-panel-control/gnome-panel-control
+tools/gdm-control/gdm-control
 version.h
 .libs
 .deps
@@ -90,3 +91,5 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh
+<+