]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.7
authorAndrey Volk <andywolk@gmail.com>
Sun, 24 Oct 2021 16:39:33 +0000 (19:39 +0300)
committerAndrey Volk <andywolk@gmail.com>
Sun, 24 Oct 2021 16:39:33 +0000 (19:39 +0300)
1  2 
build/next-release.txt
configure.ac

index 553f97dbc3e9bf2cae6a5c2f06c779d21f205b01,ef3ef3440900e9f785edeeb71c37cc86d9ccb49f..4be6fdff4090dd9ff90d7fa0d6720d9ea7de74dc
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.6-release
 -1.10.7-dev
++1.10.7-release
diff --cc configure.ac
index 52dd86e62f1446b5e34bb8d151767c0116b3eb72,73e322a6cab13526f3472655a22ec26b4325758a..00b88c03c0a23b2875526f83aeb7add07fd98348
@@@ -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.6-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.7-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.7-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [6-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [7-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [7-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])