From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Jan 2010 18:44:13 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.11~15
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=afd58f651ea884c40ac5af32f2f3e023222b5275;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working

Conflicts:

	configure.ac
---

afd58f651ea884c40ac5af32f2f3e023222b5275
diff --cc configure.ac
index e69d028b,eb11c03f..ed7a4498
--- a/configure.ac
+++ b/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)