Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:44:13 +0000 (13:44 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:44:13 +0000 (13:44 -0500)
Conflicts:

configure.ac

1  2 
configure.ac
data/rc.xml
openbox/client.c
openbox/prop.h

diff --cc configure.ac
@@@ -15,10 -15,10 +15,10 @@@ dnl if MAJOR or MINOR version changes, 
  dnl
  OB_MAJOR_VERSION=3
  OB_MINOR_VERSION=4
 -OB_MICRO_VERSION=16
 -OB_INTERFACE_AGE=0
 -OB_BINARY_AGE=0
 +OB_MICRO_VERSION=27
 +OB_INTERFACE_AGE=6
 +OB_BINARY_AGE=6
- OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+ OB_VERSION=$PACKAGE_VERSION
  
  AC_SUBST(OB_MAJOR_VERSION)
  AC_SUBST(OB_MINOR_VERSION)
diff --cc data/rc.xml
Simple merge
Simple merge
diff --cc openbox/prop.h
Simple merge