update Changelog for r12r12

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6478216..5c15b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
 This file contains information about the changes done to
 the CRC-DabMux in this repository
 
-2014-01-32: Matthias P. Braendli <matthias@mpb.li>
+2014-01-31: Matthias P. Braendli <matthias@mpb.li>
+	(tag r12):
+	* crc-dabmux:
+		Create new object-oriented abstraction for the
+		inputs, with a wrapper for all existing inputs
+		Adapt inputZMQ to the new internal interface
+		Add a telnet Remote Control interface
+
+2014-01-31: Matthias P. Braendli <matthias@mpb.li>
 	(tag r11):
 	* crc-dabmux:
 		Replace TCPLog by Logger that supports syslog
@@ -80,7 +88,7 @@ the CRC-DabMux in this repository
 Copyright (C) 2010,2011 Her Majesty the Queen in Right of Canada
 (Communications Research Center Canada)
 
-Copyright (C) 2013 Matthias P. Braendli, http://mpb.li
+Copyright (C) 2013,2014 Matthias P. Braendli, http://mpb.li
 
 This file is part of CRC-DabMux.
 
diff --git a/README b/README
index 73395fc..409aafe 100644
--- a/README
+++ b/README
@@ -37,6 +37,7 @@ to the official one:
 - supports logging to syslog
 - supports ZMQ input monitoring with munin tool
 - supports a Telnet Remote Control for setting/getting parameters
+  (this is, for now, not used yet)
 
 The src/ directory contains the source code of CRC-DabMux.