From: Andrey Volk Date: Sun, 13 Aug 2023 16:57:39 +0000 (+0300) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cb05e7f4a23645ec387f3b5391194128be7d193;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- 4cb05e7f4a23645ec387f3b5391194128be7d193 diff --cc build/next-release.txt index dc7cf8e9cc,b61c58c7d4..bbeb2b5b28 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.9-release -1.10.10-dev ++1.10.10-release diff --cc configure.ac index d90a27a0ed,c0d792d51e..2c7fd5ed65 --- 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.9-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.10-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.10-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [9-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [10-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [10-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])