]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.3
authorAndrey Volk <andywolk@gmail.com>
Mon, 11 May 2020 10:54:55 +0000 (14:54 +0400)
committerAndrey Volk <andywolk@gmail.com>
Mon, 11 May 2020 10:54:55 +0000 (14:54 +0400)
1  2 
build/next-release.txt
configure.ac

index 7c64495cce4068f58936fcd2ea8d27b08a578009,e552f820c1f74bab224064feede8abdaa988db97..145fe2dd008663195243d15a858a7c753e6cb259
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.2-release
 -1.10.3-dev
++1.10.3-release
diff --cc configure.ac
index 57373a6b1e477d695c6a836ab922ac8cbf5f5844,871d2c0d8872a0698e6941b41052fa81bea9b960..c5f10ef2adfcdbc72947c864cb61342e207dde4f
@@@ -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, [])