]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.10 v1.10 v1.10.12
authorAndrey Volk <andywolk@gmail.com>
Fri, 2 Aug 2024 21:02:27 +0000 (00:02 +0300)
committerAndrey Volk <andywolk@gmail.com>
Fri, 2 Aug 2024 21:02:27 +0000 (00:02 +0300)
1  2 
build/next-release.txt
configure.ac

index 56a26def87f2ff0da6ff736a73ee9a71d031013d,a3426275e7252116d3621a24c7eaea245c2fc7a1..66c5ba2d7f1da402cab02bb5bf768d19007d6ce3
@@@ -1,1 -1,1 +1,1 @@@
- 1.10.11-release
 -1.10.12-dev
++1.10.12-release
diff --cc configure.ac
index cbcd62e30428b83c3ef7b1144142161532bbbad3,348103f8db6da1817a29ff706e52598607851bee..469d5399a418e0cd7af8bf5f519e378af6eb999d
@@@ -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.11-release], bugs@freeswitch.org)
 -AC_INIT([freeswitch], [1.10.12-dev], bugs@freeswitch.org)
++AC_INIT([freeswitch], [1.10.12-release], bugs@freeswitch.org)
  AC_SUBST(SWITCH_VERSION_MAJOR, [1])
  AC_SUBST(SWITCH_VERSION_MINOR, [10])
- AC_SUBST(SWITCH_VERSION_MICRO, [11-release])
 -AC_SUBST(SWITCH_VERSION_MICRO, [12-dev])
++AC_SUBST(SWITCH_VERSION_MICRO, [12-release])
  AC_SUBST(SWITCH_VERSION_REVISION, [])
  AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])