Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 47 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index bc9f25a..d3745d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,52 @@
  (Format: Year/Month/Day)
 Changes for 1.1.2
+
+*09/10/03:
+   * Build system cleanup: Check for extension headers (Mathias)
+     autogen.sh configure.in, removed 'missing' file
+
+*09/10/02:
+   * Bugfix: fluxbox-update_configs wiped out keys file (Mathias)
+     util/fluxbox-update_configs.cc
+
+*09/10/01:
+   * Cleanup, compiler fixes, simplification all over the source (Mathias)
+
+*09/09/23:
+   * Bugfix: Empty submenus lead to misfunction of the 'HideMenus' command (Mathias)
+     FbTk/Menu.cc
+
+*09/09/12:
+   * Implemented visibility of titlebar buttons via the apps file (Mathias)
+     Window.cc
+
+*09/06/28:
+   * Allow matching screen number in ClientPattern (thanks Peter Hercek)
+     ClientPattern.cc
+   * Hide the menu when you click on a window (Mark)
+     Window.cc
+   * Make Raise/LowerLayer commands accept integer argument, defualt 2 (Mark)
+     CurrentWindowCmd.cc/hh Window.cc/hh
+   * Change default toolbar head to 1 (Mark)
+     Toolbar.cc
+   * Add window menu and alt-tab to error case for keys file (Mark)
+     Keys.cc
+   * Revert to relative iconbar alignment when too many windows are open (Mark)
+     FbTk/Container.cc
+
+*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