From 6f083d3eb74f473c38c623693aedfe30599c54e3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 11:21:46 +0100
Subject: Merging upstream version 1.14~rc2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 91fa7c9..270acbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-25  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.14-rc2 released.
+	* Minor fixes.
+	* main.cc (show_header): Show header version if verbosity >= 4.
+
 2013-02-27  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 1.14-rc1 released.
-- 
cgit v1.2.3