From: Dana Jansens <danakj@orodu.net>
Date: Mon, 21 Dec 2009 15:43:38 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Tag: mikabox-3.5-7~388
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=a03b817aeb7fe32be881c30d50fab79455db08c5

Merge branch 'backport' into work
---

a03b817aeb7fe32be881c30d50fab79455db08c5
diff --cc .gitignore
index fa2b390,907abb9..39c864c
--- a/.gitignore
+++ b/.gitignore
@@@ -48,11 -48,10 +48,11 @@@ po/en@boldquot.insert-heade
  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/obprop/obprop
+ tools/obxprop/obxprop
  version.h
  .libs
  .deps