From: Dana Jansens <danakj@orodu.net>
Date: Tue, 5 Jun 2007 18:52:20 +0000 (+0000)
Subject: merge 7389 from trunk
X-Git-Tag: release-3.4.3~96
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0cf6b498f25db7edc88994eb5a2a198c9fd3d370;p=dana%2Fopenbox.git

merge 7389 from trunk
---

diff --git a/CHANGELOG b/CHANGELOG
index 6abceec6..814bcdd4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@
   * 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
+  * Changes to how Shift/Control/CapsLock are used
   * 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