merged with 2_1-merged-to-HEAD-2002-09-30

[chaz/openbox] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index abc2072b43a5477f326f75cf5d4c6fd426b29bcb..0e324b9392c6807e8ac5a3daa8e2507c87c74ee3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,18 @@
 Changelog for Openbox:
+2.2.0
+ * Bitmap buttons                                      (Scott Moynes)
+
+2.1.1:
+ * A build fix for xftlsfonts.                          (Scott Moynes)
+
+ * Add a configuration menu for changing Xft font       (Ben Jansens)
+   options, when Xft is compiled in.
 
 2.1.0:
- * make alt-right-click resizing work on bottom window  (Ben Jansens)
+ * Make alt-right-click resizing work on bottom window  (Ben Jansens)
    handles.
 
- * drop shadows for fonts, optional. (dropShadowFonts   (Ben Jansens)
+ * Drop shadows for fonts, optional. (dropShadowFonts   (Ben Jansens)
    in the rc file).
 
  * GNOME 2 Support. (Fixed problems with Gnome 2        (Ben Jansens)
@@ -145,4 +153,4 @@ Changelog for Openbox:
    ~/.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.
\ No newline at end of file
+   simple, internal menu is used instead.