summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2011-12-12 14:40:18 +0100
committerLinus Nordberg <linus@nordu.net>2011-12-12 14:40:18 +0100
commit85df2f023a746cf200f24d9d36f0d9eb18a673cf (patch)
tree325cb5b3be83b492e399d649b2fee3c7b82a92a1 /ChangeLog
parent70fa9c5f1c05812c24eea0efe56f76549b40ba31 (diff)
parentef8e142b62e4d2e0268c752a2983544d36676045 (diff)
Merge branch 'master' into fticks_syslog2
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1809e38..57dc4d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-12 1.6-dev
+ Bug fixes:
+ - Stop the autoconfery from warning about defining variables
+ conditionally and unconditionally.
+
2011-10-08 1.5
New features:
- Support for F-Ticks logging.