Merge branch 'master' of git://nwl.cc/~n0-1/conky

[monky] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 297b821..3c5149c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,11 @@
 
 2008-12-15
        * Have a maximum width for all variable length mpd vars
+       * Patch to allow escaping newlines in the config (thanks Itai)
 
 2008-12-14
        * Fix disk_protect for linux-2.6.27 (and hopefully above)
+       * Improve behaviour of $pb_battery
 
 2008-12-09
        * Add an option to timed_thread_test() to not wait for the interval period