From c14d1693bdd22c33c4cf48acb77cf51b1769dc77 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 15:00:38 +0100
Subject: Merging upstream version 1.6~pre1.

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 a6472cb..43b33db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-07  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.6-pre1 released.
+	* configure: Added new option '--disable-ldconfig'.
+	* Makefile.in: Ignore errors from ldconfig.
+
 2013-09-15  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.5 released.
-- 
cgit v1.2.3