summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-21 10:43:38 -0500
committerDana Jansens <danakj@orodu.net>2009-12-21 10:43:38 -0500
commita03b817aeb7fe32be881c30d50fab79455db08c5 (patch)
tree0c3fffbd7ecd565cf1bfbf66be04e00563a3463f /.gitignore
parentb7393636e05c95ec068e8a1ff063cbefa63a901b (diff)
parent6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 (diff)
Merge branch 'backport' into work
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index fa2b3904..39c864c0 100644
--- 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