]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.1
authorAndrey Volk <andywolk@gmail.com>
Tue, 20 Aug 2019 16:54:04 +0000 (20:54 +0400)
committerAndrey Volk <andywolk@gmail.com>
Tue, 20 Aug 2019 16:54:04 +0000 (20:54 +0400)
1  2 
build/next-release.txt
configure.ac

index ba177fe9fd2ee29c5115eb098daa00fdf93b2e98,3334f6d4e040ad081ea651bd1a6d78de93f5cdf7..63973ec2d4b7016bf9e0894ada17154bc922aa3f
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.0-release
 -1.10.1-dev
++1.10.1-release
diff --cc configure.ac
index d2ae91b75c4c6c9233434c0a4be793a98b589647,9b6cef90274492a498011a5da0280eea4121648f..95f4d16d4265fa121620689057fd333651887053
@@@ -3,10 -3,10 +3,10 @@@
  
  # Must change all of the below together
  # For a release, set revision for that tagged release as well and uncomment
- AC_INIT([freeswitch], [1.10.0-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.1-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.1-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [0-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [1-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [1-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])