2 files changed, 15 insertions, 0 deletions

diff --git a/AUTHORS b/AUTHORS
index 9ac254f..33adc02 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,8 @@ Main developers:
     Mark Tiefenbruck <mark(at)fluxbox.org>
 
 Contributors:
+    Jim Ramsay <i.am(at)jimramsay.com>
+      - documentation updates, bugfixes, some code.
     Han Boetes <han(at)mijncomputer.nl>
       - RPM Packaging, debugging and scripts.
           - fbsetbg, fluxbox-generate_menu
diff --git a/ChangeLog b/ChangeLog
index bc9f25a..8625d5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
  (Format: Year/Month/Day)
 Changes for 1.1.2
+*09/05/26:
+   * Fixed unexpected window focus changes under "focus follows mouse" (Jim)
+     FocusControl.cc/hh Window.cc fluxbox.cc Screen.cc
+   * Make fbsetbg quieter on '-z' if there's no lastwallpaper (Jim)
+     util/fbsetbg
+   * Add new "background: unset" property for use in overlays. (Jim)
+     RootTheme.cc
+   * Key file parsing error for MacroCmd with unterminated {...} pairs (Jim)
+     FbTk/StringUtil.hh FbTk/MacroCommand.cc
+   * Many documentation updates (Jim):
+     * Rewrote most manpages into asciidoc format
+     * Split monolithic fluxbox(1) into fluxbox-apps(5), fluxbox-menu(5)
+     * Renamed fluxstyle(1) to fluxbox-style(5)
 *08/11/01:
    * Don't reload keys file when modifier map changes, just regrab (Mark)
      Keys.cc/hh fluxbox.cc