From: Andrey Volk Date: Thu, 25 Mar 2021 13:16:09 +0000 (+0300) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ff9d0a60e00c887d653805b3c6c7aa93443a05b;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- 1ff9d0a60e00c887d653805b3c6c7aa93443a05b diff --cc build/next-release.txt index 2b93e01043,defa9f0e12..553f97dbc3 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.5-release -1.10.6-dev ++1.10.6-release diff --cc configure.ac index 2f9de1dee9,810003eda2..52dd86e62f --- 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.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, [])