From: Andrey Volk Date: Sun, 24 Oct 2021 16:39:33 +0000 (+0300) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=883d2cb662bed0316e157bd3beb9853e96c60d02;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- 883d2cb662bed0316e157bd3beb9853e96c60d02 diff --cc build/next-release.txt index 553f97dbc3,ef3ef34409..4be6fdff40 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.6-release -1.10.7-dev ++1.10.7-release diff --cc configure.ac index 52dd86e62f,73e322a6ca..00b88c03c0 --- a/configure.ac +++ b/configure.ac @@@ -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, [])