X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=ChangeLog;h=95bb4718d8397338b10430295a6e861eba0d882f;hb=6f9e73f8f0b88d1258e99397d9ca8b1afca5085e;hp=ecdfc588bc78eb7101d871765aa4168e362fef59;hpb=2e6b12080e5187b0e0db377cd4df22405119e5b8;p=chaz%2Ftint2

diff --git a/ChangeLog b/ChangeLog
index ecdfc58..95bb471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+
+2009-05-15
+- merge battery applet from Sebastian Reichel <elektranox@gmail.com>
+
+2009-03-14
+- add systray option when convert tint-0.6 config file
+  but you need to stop other systemtray program
+
 2009-03-07
 - fixed segfault when time1_format empty
 - fixed systray : when clock change size