]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.6
authorAndrey Volk <andywolk@gmail.com>
Thu, 25 Mar 2021 13:16:09 +0000 (16:16 +0300)
committerAndrey Volk <andywolk@gmail.com>
Thu, 25 Mar 2021 13:16:09 +0000 (16:16 +0300)
1  2 
build/next-release.txt
configure.ac

index 2b93e01043e4d74f95f540b4fde878f71a4002e9,defa9f0e12a0a296cd69b539fa47cde474af2567..553f97dbc3e9bf2cae6a5c2f06c779d21f205b01
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.5-release
 -1.10.6-dev
++1.10.6-release
diff --cc configure.ac
index 2f9de1dee9650f7b21a093c5b571db0a97851fa4,810003eda26e366f6696918906d6e12f609e8927..52dd86e62f1446b5e34bb8d151767c0116b3eb72
@@@ -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.5-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.6-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.6-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [5-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [6-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [6-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])