Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index e9374053e4bf091c737920b249a17535a55e6d46..bc20413dc270d1d49dd4c765a7d8635595041f58 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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
@@ -90,3 +92,5 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh
+<+