From: Andrey Volk Date: Mon, 11 May 2020 10:54:55 +0000 (+0400) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=129de34d845098b7864a49281f3eb946e0b50314;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- 129de34d845098b7864a49281f3eb946e0b50314 diff --cc build/next-release.txt index 7c64495cce,e552f820c1..145fe2dd00 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.2-release -1.10.3-dev ++1.10.3-release diff --cc configure.ac index 57373a6b1e,871d2c0d88..c5f10ef2ad --- 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.2-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.3-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.3-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [2-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [3-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [3-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])