From: Andrey Volk Date: Tue, 20 Aug 2019 16:54:04 +0000 (+0400) Subject: Merge branch 'master' into v1.10 X-Git-Tag: v1.10.1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9990221e6094886066ec2bf9685648135bd405a;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into v1.10 --- f9990221e6094886066ec2bf9685648135bd405a diff --cc build/next-release.txt index ba177fe9fd,3334f6d4e0..63973ec2d4 --- a/build/next-release.txt +++ b/build/next-release.txt @@@ -1,1 -1,1 +1,1 @@@ - 1.10.0-release -1.10.1-dev ++1.10.1-release diff --cc configure.ac index d2ae91b75c,9b6cef9027..95f4d16d42 --- 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.0-release], bugs@freeswitch.org) -AC_INIT([freeswitch], [1.10.1-dev], bugs@freeswitch.org) ++AC_INIT([freeswitch], [1.10.1-release], bugs@freeswitch.org) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [10]) - AC_SUBST(SWITCH_VERSION_MICRO, [0-release]) -AC_SUBST(SWITCH_VERSION_MICRO, [1-dev]) ++AC_SUBST(SWITCH_VERSION_MICRO, [1-release]) AC_SUBST(SWITCH_VERSION_REVISION, []) AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])