Merge branch 'master' into chaz

[chaz/openbox] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index fe81a85951a32aec7ade7506effbc274a1946873..65be74d2b34741e1dbeebd4b48b81ff7245c8351 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+3.5.2:
+  * Fix crash in theme rendering code, and in theme parsing code.
+  * Maximize windows without borders to fill the whole screen, don't leave
+    a one-pixel empty space. (Bug #5996)
+
 3.5.1:
   * New translations: Afrikaans, Belarusian, Interlingua, Hebrew, Romanian,
     Greek.
@@ -15,7 +20,7 @@
   * Correctly interface with latest gnome-session for Gnome/Openbox X sessions.
   * Allow third-party control of window opacity in compositing managers.
   * Improved themeing options. Contributed by Dave Foster.
-  * Add <monitor>, <title type="regex">, <title type="plain"> and
+  * Add <monitor>, <title type="regex">, <title type="exact"> and
     <activedesktop> options to If action.
   * Addresses bugs #4661, #5506, #5186, #5758, #5410, #5228, #5277, #5731,
     #5746, #5737, #5419, #5721, #5711, #5385, #5500, #4992, #5443, #5518,