From: Andrey Volk Date: Fri, 2 Aug 2024 21:02:27 +0000 (+0300) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fv1.10;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- a88d069d6ffb74df797bcaf001f7e63181c07a09 diff --cc build/next-release.txt index 56a26def87,a3426275e7..66c5ba2d7f --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.11-release -1.10.12-dev ++1.10.12-release diff --cc configure.ac index cbcd62e304,348103f8db..469d5399a4 --- 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.11-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.12-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.12-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [11-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [12-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [12-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])