recent changes

diff --git a/CHANGELOG b/CHANGELOG
index 1b20c22..38ca869 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,15 +1,21 @@
-:
+3.0-rc1:
        * Closed bug #875 (RaiseLower fails to funtion on windows with dialogs)
        * Added the <moveButton> option for moving dock apps around inside the
        dock. (Closes bug #798)
-       * Made the "Desktop" action show the pager/desktop dialog.
-       * Add the <dialog> section to the rc.xml to allow the disabling of the
-       focus and pager/desktop dialogs.
+       * Made the "Desktop" action show the pager/desktop dialog
+       * Add the <dialog> option to the Desktop and Focus switching actions
        * No longer iconify fullscreen windows when they lose focus (Closes
        bug #876)
        * When not using focusLast, when a focused transient is closed, focus
-       will still fallback to its parent or transient siblings.
-       * Improved intelligence for focus cycling with modal transients.
+       will still fallback to its parent or transient siblings
+       * Improved intelligence for focus cycling with modal transients
+       * Removed the focusLast option
+       * Added the placement-policy option to select if windows are placed
+       under the mouse pointer
+       * Children inherit their window icon from their parent
+       * Closed bug #878 (minimal resizing of mplayer makes openbox crash)
+       * Fix case where opening a menu would leave Openbox in a locked state
+       * Upstream updates for TheBear theme
 
 3.0-beta6:
        * Added _OB_WM_STATE_UNDECORATED hint, which can be read and controlled