merge 7353-54 from trunk

diff --git a/CHANGELOG b/CHANGELOG
index 8f2939180fc4e155ddb9fc924b2bd25f27db4ace..1cfe7dea33695aaff5faadaa8634bf756ffec5c8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,11 @@
   * Rename new theme element menu.items.activedisabled to
     menu.items.active.disabled for consistency with other elements
   * Improvements to smart placement - especially with xinerama (Twinview)
+  * Fixes for focus with omnipresent windows - Allow focus to fallback to them
+    except during desktop switches (other mechanisms exist for that)
+  * Fix for putting child windows (transients) on all desktops
+  * Fix focus fallback when windows are not visible (showing the desktop, or
+    iconic windows)
   * Fix bug #3196 - Unable to alt-tab away from full-screen windows
   * Fix crash in parsing empty xml fields
   * Fix left and right contexts resizing the wrong way in the example mouse

diff --git a/configure.ac b/configure.ac
index 50c2a47ff7a077e8c2b45b9886585a0d0db38f8f..7519e2e2c9c043cd7926bb6f387df6c2b97356bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [3.3.996], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.4.0], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([openbox/openbox.c])
 
@@ -15,9 +15,9 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 OB_MAJOR_VERSION=3
 OB_MINOR_VERSION=4
-OB_MICRO_VERSION=12
-OB_INTERFACE_AGE=0
-OB_BINARY_AGE=0
+OB_MICRO_VERSION=13
+OB_INTERFACE_AGE=1
+OB_BINARY_AGE=1
 OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
 
 AC_SUBST(OB_MAJOR_VERSION)