changes 1.6.10

diff --git a/VERSION.cmake b/VERSION.cmake
index a2c9d84..5fcc005 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -31,7 +31,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "6")
-SET(VERSION_PATCH "9")
+SET(VERSION_PATCH "10")
 
-# LAST RELEASED: 1.6.9
+# LAST RELEASED: 1.6.10
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 3580656..c43f6a9 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Jun  6 14:49:06 CEST 2011 - dheidler@suse.de
+
+- fix crashing zypper when there are double config entrys
+  in zypper.conf (bnc#614646)
+- 1.6.10
+
+-------------------------------------------------------------------
 Tue May 31 18:01:06 CEST 2011 - ma@suse.de
 
 - No longer use deprecated ZYppCommitResult methods.