Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 907abb9bf3c1d16e9d431825f5942b768da02675..39c864c0386f686e0d1e4d4d4008c11a038794cc 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
 tools/gdm-control/gdm-control
 tools/obxprop/obxprop