merge 7389 from trunk

diff --git a/CHANGELOG b/CHANGELOG
index 6abceec672bc5e21216fd52f9c44163bc9f908cf..814bcdd41cafe80b17d5dac92007f9a5ae68d483 100644 (file)
--- 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