bump version to 1.28.106

2015-08-29 08:00:02 -05:00 · 2015-08-29 08:00:02 -05:00 · 4a04d0411b
parent 395e628541
commit 4a04d0411b
3 changed files with 0 additions and 12 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,11 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-<<<<<<< HEAD
-set(zoneminder_VERSION "1.28.105")
-=======
 set(zoneminder_VERSION "1.28.106")
->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")

--- a/configure.ac
+++ b/configure.ac
@ -3,11 +3,7 @@
 # For instructions on building with cmake, please see INSTALL
 #
 AC_PREREQ(2.59)
-<<<<<<< HEAD
 AC_INIT(zm,1.28.105,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
-=======
-AC_INIT(zm,1.28.106,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
--- a/4
+++ b/4
@ -1,5 +1 @@
-<<<<<<< HEAD
-1.28.105
-=======
 1.28.106
->>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab