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

diff --git a/ChangeLog b/ChangeLog
index 272059f..95bb471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+
+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