From 8ae6b686ab808093012f43aff5b7567895caa8a9 Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Mon, 8 Sep 2003 19:47:41 +0000
Subject: update

---
 ChangeLog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a27218..ddc4b80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
 (Format: Year/Month/Day)
 Changes for 0.9.6:
-<<<<<<< ChangeLog
-
-=======
 *03/09/08:
+   * Added iconbar mode menu (Henrik)
+     * new resource item:
+       session.screen<num>.iconbar.mode: <mode>
+     Toolbar.cc, IconbarTool.cc/hh
    * Added icon list sig to Screen (Henrik)
      This will notify when the icon list changed.
      Useful for IconbarTool
-- 
cgit v0.11.2