]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10.11
authorAndrey Volk <andywolk@gmail.com>
Fri, 22 Dec 2023 18:08:31 +0000 (21:08 +0300)
committerAndrey Volk <andywolk@gmail.com>
Fri, 22 Dec 2023 18:08:31 +0000 (21:08 +0300)
1  2 
build/next-release.txt
configure.ac

index bbeb2b5b288f8792756121c37a61547934f9f985,63fd3adc74156057edb383e8ab1b6ab2fe87726d..56a26def87f2ff0da6ff736a73ee9a71d031013d
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.10-release
 -1.10.11-dev
++1.10.11-release
diff --cc configure.ac
index 2c7fd5ed651bdb589a42cbe574b2a8a2b462890e,56bf86f53c124c150bd467b99a9ab0429f555b0e..cbcd62e30428b83c3ef7b1144142161532bbbad3
@@@ -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.10-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.11-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.11-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [10-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [11-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [11-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])