]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.10
authorAndrey Volk <andywolk@gmail.com>
Sun, 13 Aug 2023 16:57:39 +0000 (19:57 +0300)
committerAndrey Volk <andywolk@gmail.com>
Sun, 13 Aug 2023 16:57:39 +0000 (19:57 +0300)
1  2 
build/next-release.txt
configure.ac

index dc7cf8e9cced8e58b2255b9f460d651a2725a7bb,b61c58c7d492fc34307c97923bb3455f4dcb12c7..bbeb2b5b288f8792756121c37a61547934f9f985
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.9-release
 -1.10.10-dev
++1.10.10-release
diff --cc configure.ac
index d90a27a0ed2cc872f07dc27e7e8cc75e2cf7ce67,c0d792d51e35fd36615bdd91752c8afd12243fca..2c7fd5ed651bdb589a42cbe574b2a8a2b462890e
@@@ -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, [])