From f5fbafeb9e20af2a285019114412ab73124512ed Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Wed, 4 Jan 2017 22:18:50 +0100
Subject: merge changelog

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 2e3458e..67c50c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 201?.??.?? -- Version 0.?.?
 
 * added RAIL mode
+
+2017.01.04 -- Version 0.3.6
+
 * moved to GIT
+* make build reproducible
+* the return code after receiving a signal now correctly contains
+  the signal number which caused the shutdown.
 
 2014.06.21 -- Version 0.3.5
 
-- 
cgit v1.2.3