Merge branch 'backport' into work
[dana/openbox.git] / .gitignore
index e937405..fa2b390 100644 (file)
@@ -51,6 +51,8 @@ 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
+tools/obprop/obprop
 version.h
 .libs
 .deps
@@ -71,6 +73,7 @@ tests/grouptran
 tests/grouptran2
 tests/grouptrancircular
 tests/grouptrancircular2
+tests/iconifydelay
 tests/icons
 tests/mapiconic
 tests/modal
@@ -90,3 +93,5 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh
+<+