changes 1.10.4

diff --git a/VERSION.cmake b/VERSION.cmake
index 99acf53..1c257e1 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -34,7 +34,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "10")
-SET(VERSION_PATCH "3")
+SET(VERSION_PATCH "4")
 
-# LAST RELEASED: 1.10.3
+# LAST RELEASED: 1.10.4
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 39d2a7d..057a6a0 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jan 29 10:57:54 CET 2014 - ma@suse.de
+
+- Don't treat missing packages due to download mode as error in 
+  fileconflict check.
+- version 1.10.4
+
+-------------------------------------------------------------------
 Sun Jan 26 01:14:20 CET 2014 - ma@suse.de
 
 - Update zypper-po.tar.bz2