Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index e9374053e4bf091c737920b249a17535a55e6d46..3f68a41191af3f8468a065ecda14f3a0b90ecf8f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh