From: Andrey Volk Date: Tue, 18 Aug 2020 18:51:21 +0000 (+0400) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25569c16311afb3fe04a445830a8ab5c88488a5e;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- 25569c16311afb3fe04a445830a8ab5c88488a5e diff --cc build/next-release.txt index 1c795d02d1,3e5a73e8a4..2b93e01043 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.4-release -1.10.5-dev ++1.10.5-release diff --cc configure.ac index 8a5e154ed9,169e899807..2f9de1dee9 --- 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.4-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.5-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.5-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [4-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [5-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [5-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])