Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index fa2b39043144cb05261c0a4fc8e412c49b9cc7a1..39c864c0386f686e0d1e4d4d4008c11a038794cc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,7 @@ 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
+tools/obxprop/obxprop
 version.h
 .libs
 .deps