2 files changed, 29 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 2349251..25b61fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,28 @@
 Changes for 0.1.7:
+*02/01/27:
+   * Clean up in menu loading
+   * Moved from old C style file reading to c++ istream
+     in menu loading
+   * Fixed small bug in StringUtil::expandFilename (Thanks Mauro Persano)
+*02/01/26:
+   * Fixed BadWindow error from ~FluxboxWindow (frame.handle was destroyed before the children)
+   * Fixed indentation in BaseDisplay.hh/.cc and changed some variables
+   * Updated Russian translation (Thanks Anton Denisov)
+   * Clean up in Tab code (Thanks Jesper Louis Andersen)
+*02/01/20:
+   * Fixed std::string for Toolbar workspace name change.
+   * Added getStringBetween to StringUtil
+*02/01/19:
+   * Fixed some screen resources to Resource<T>
+   * Updated init.in
+   * Created GrabGuard for BaseDisplay
 *02/01/18:
-   * Fixed bsetroot, now Eterm's, XChat's and similiar will be able to use
-     bsetroots background images. (Claes Nästén)
+   * Fixed bsetroot, now Eterm's, XChat's and similar will be able to use
+     bsetroot's background images. (Claes Nästén)
    * Fixed ResourceManager 
    * Changed resources to Resource<T> in class Fluxbox
-   * Added Resource.hh/.cc, XrmDatabaseHelper.hh, NotCopyable.hh
+   * Added Resource.hh/.cc, XrmDatabaseHelper.hh, 
+     NotCopyable.hh
 *02/01/16:
    * Fixed indent in Window.hh
 *02/01/15:
diff --git a/TODO b/TODO
index 1f8858c..d599860 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,9 @@
 TODO for Fluxbox 0.2.0
+Screen.cc {
+        fix toupper for str_key in in Menu loading
+        nls for "error on row" in Menu loading ??
+}
+* 
 * Remove the cylic dep between class Tab and class Window
 * Fix "no font" crash
 * Remove cyclic dep on Basemenu with class Fluxbox
@@ -10,12 +15,9 @@ TODO for Fluxbox 0.2.0
 
 * Fix so toolbar dont hide if its autohide and
         you are in "change workspace mode"
-
-* grabKillWindow to keygrabber grabCloseWindow
-
-* Fix snapping for {VERT,HORIZ}{INC,DEC} keybindings when resising for example
-  xterms.
-* grabRootmenu
+* the BadAccess error in Theme
+* Finska översättning
+* keybinding for ROOTMENU
 * wheel-config support
 * separator in the menus
 (* restructure BImageControl::parseTexture)
@@ -30,8 +32,4 @@ TODO for Fluxbox 0.2.0
   regular)- Add "system menu" for minimized apps in the toolbar.
   (Close, Kill, Send to, etc) )
         
-*  HUP the window manager, so it re-reads the
-          .fluxbox/init - rather than having to kill the window manager to change those
-          settings (like the key map)
-
 * "Iconify group" in Windowmenu