Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3baae1438b16b13785bf0bea7382c9c7fabdf0d5..3f68a41191af3f8468a065ecda14f3a0b90ecf8f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,7 @@ m4/*.m4
 missing
 .dirstamp
 openbox/openbox
-parser/obparser-3.0.pc
+parser/obparser-4.0.pc
 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES
@@ -48,7 +48,8 @@ po/en@boldquot.insert-header
 po/en@quot.insert-header
 po/remove-potcdate.sed
 *.gmo
-render/obrender-3.0.pc
+render/obrender-4.0.pc
+obt/obt-4.0.pc
 tools/gnome-panel-control/gnome-panel-control
 version.h
 .libs
@@ -89,3 +90,4 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh