From 78849b02d4d91f4022bf1beff521a8d756b82872 Mon Sep 17 00:00:00 2001
From: Martin Lund <martin.lund@keep-it-simple.com>
Date: Mon, 6 Nov 2017 15:22:12 +0100
Subject: [PATCH] Update ChangeLog

---
 ChangeLog | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 21022e9..bd42d2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
 
-=== tio v1.25 ===
+=== tio v1.26 ===
+
+
+Changes since tio v1.25:
+
+ * Reconfigure stdin
+
+   Make stdin behave more raw'ish. In particular, don't
+   translate CR -> NL on input.
+
+ * Add special character map feature
+
+   Add a --map option which allows to map special characters, in particular CR and
+   NL characters which are used in various combinations on varios platforms.
+
+ * Cleanup
+
+ * Update AUTHORS
+
+ * Update README
+
+ * Mention website
+
+ * Update man page
+
 
 
 Changes since tio v1.24: