From 67c936be3377781ccf12868e6d9ca3b7859ee2a0 Mon Sep 17 00:00:00 2001
From: horchi <vdr@jwendel.de>
Date: Tue, 2 Jan 2018 17:01:16 +0100
Subject: 2017-01-02: version 1.1.126 (ckone)\n   - change: improved handling
 of reinstated events in merge procedure\n\n

---
 HISTORY.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'HISTORY.h')

diff --git a/HISTORY.h b/HISTORY.h
index b47b128..5e889cc 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -4,8 +4,8 @@
  * -----------------------------------
  */
 
-#define _VERSION     "1.1.125"
-#define VERSION_DATE "21.12.2017"
+#define _VERSION     "1.1.126"
+#define VERSION_DATE "02.01.2017"
 #define DB_API       5
 
 #ifdef GIT_REV
@@ -18,6 +18,9 @@
  * ------------------------------------
  *
 
+2017-01-02: version 1.1.126 (ckone)
+   - change: improved handling of reinstated events in merge procedure
+
 2017-12-22: version 1.1.125 (horchi)
    - change: new field in 'recordinglist' to store the original description
 
-- 
cgit v1.2.3