From: Andrey Volk Date: Tue, 31 Dec 2019 14:01:19 +0000 (+0400) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7bdd3845a91c77ff6c776a70ae2fc9d7f7d3f86;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- f7bdd3845a91c77ff6c776a70ae2fc9d7f7d3f86 diff --cc build/next-release.txt index 63973ec2d4,de4df648d8..7c64495cce --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.1-release -1.10.2-dev ++1.10.2-release diff --cc configure.ac index 95f4d16d42,40e27c6094..57373a6b1e --- 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.1-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.2-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.2-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [1-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [2-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [2-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])