From: Dana Jansens Date: Mon, 14 Dec 2009 20:25:57 +0000 (-0500) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=a93b00a5e93281c7c2c31112f0b6b827d605a19d;p=chaz%2Fopenbox Merge branch 'backport' into work --- a93b00a5e93281c7c2c31112f0b6b827d605a19d diff --cc .gitignore index 9e6bcb6b,3ea0363d..bc20413d --- 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