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

Merge branch 'backport' into work
---

a93b00a5e93281c7c2c31112f0b6b827d605a19d
diff --cc .gitignore
index 9e6bcb6,3ea0363..bc20413
--- a/.gitignore
+++ b/.gitignore
@@@ -48,10 -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
  version.h
  .libs
  .deps