ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump version to 1.28.106

This commit is contained in:
Andy Bauer 2015-08-29 08:00:02 -05:00
parent 395e628541
commit 4a04d0411b
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -4,11 +4,7 @@
# #
cmake_minimum_required (VERSION 2.6) cmake_minimum_required (VERSION 2.6)
project (zoneminder) project (zoneminder)
<<<<<<< HEAD
set(zoneminder_VERSION "1.28.105")
=======
set(zoneminder_VERSION "1.28.106") set(zoneminder_VERSION "1.28.106")
>>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab
# make API version a minor of ZM version # make API version a minor of ZM version
set(zoneminder_API_VERSION "${zoneminder_VERSION}.1") set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")

4
configure.ac
View File

@ -3,11 +3,7 @@
# For instructions on building with cmake, please see INSTALL # For instructions on building with cmake, please see INSTALL
# #
AC_PREREQ(2.59) 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.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 AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR(src/zm.h) AC_CONFIG_SRCDIR(src/zm.h)
AC_CONFIG_HEADERS(config.h) AC_CONFIG_HEADERS(config.h)

4
version
View File

@ -1,5 +1 @@
<<<<<<< HEAD
1.28.105
=======
1.28.106 1.28.106
>>>>>>> 4fdd32b59638dceea568eae8bdefa92493cd72ab