Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Mon, 21 Dec 2009 15:43:38 +0000 (10:43 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 21 Dec 2009 15:43:38 +0000 (10:43 -0500)
1  2 
.gitignore
Makefile.am
data/rc.xml
openbox/event.c

diff --cc .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
diff --cc Makefile.am
Simple merge
diff --cc data/rc.xml
Simple merge
diff --cc openbox/event.c
Simple merge