moved menu from a rc file option to a command line option

[chaz/openbox] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index f0eb3e6843e518c3de210972c7d3d8f08a00b75d..a192aca46b88934c210f756414ccca327f263257 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,33 @@
 Changelog for Openbox:
 
 1.2.0:
+ * changed the menu from an rcfile option to a command-
+   line option. use 'openbox -menu <file>' to select an
+   alternate menu. The default menu used is
+   ~/.openbox/menu. If the default, or the file you
+   specify does not exist, the global menu is tried.
+   And if the global menu also does not exist, a
+   simple, internal menu is used instead.               (Ben Jansens)
+
+ * new version of bsetroot ported from blackbox cvs
+   with intent to support Eterm/Esetroot.               (Sean Perry)
+
+ * make bsetroot behave properly with Eterm/Esetroot.   (Ben Jansens)
+
+ * new version of bsetbg.                               (Timothy King)
+
+ * fix the 'wrong window move' bug displayed by apps
+   such as bbkeys.                                      (Sean Perry)
+
+ * fix bug when removing and then readding a titlebar
+   button witout restarted (by reconfiguring).          (Ben Jansens)
+
  * more focus code changes. also fixes a segfault from
    last round of focus changes.                         (Ben Jansens)
  
  * make image dithering value load correctly.           (Ben Jansens)
 
- * fix segfault with multiple screens.                  (Shaleh Perry)
+ * fix segfault with multiple screens.                  (Sean Perry)
 
 1.1.0:
  * improved focused window logic to remove a segfault