Skip to content

Commit f24064f

Browse files
committed
Merge branch 'master' into v1.10
2 parents 4cb05e7 + 6ae8ce6 commit f24064f

File tree

47 files changed

+5459
-7960
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5459
-7960
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ This is the place to get answers faster and chat with other users in real time.
6767
Slack Community:
6868
* https://signalwire.community/
6969

70-
Mailing list:
70+
Mailing list (ARCHIVED):
7171

72-
* http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
72+
* http://lists.freeswitch.org/pipermail/freeswitch-users/
7373

7474
**Thank you for using FreeSWITCH!**

build/next-release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.10-release
1+
1.10.11-release

conf/curl/autoload_configs/timezones.conf.xml

Lines changed: 657 additions & 547 deletions
Large diffs are not rendered by default.

conf/insideout/autoload_configs/timezones.conf.xml

Lines changed: 657 additions & 547 deletions
Large diffs are not rendered by default.

conf/minimal/autoload_configs/timezones.conf.xml

Lines changed: 652 additions & 1841 deletions
Large diffs are not rendered by default.

conf/rayo/autoload_configs/timezones.conf.xml

Lines changed: 657 additions & 547 deletions
Large diffs are not rendered by default.

conf/sbc/autoload_configs/timezones.conf.xml

Lines changed: 657 additions & 547 deletions
Large diffs are not rendered by default.

conf/testing/autoload_configs/timezones.conf.xml

Lines changed: 652 additions & 1841 deletions
Large diffs are not rendered by default.

conf/vanilla/autoload_configs/timezones.conf.xml

Lines changed: 652 additions & 1807 deletions
Large diffs are not rendered by default.

configure.ac

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# Must change all of the below together
55
# For a release, set revision for that tagged release as well and uncomment
6-
AC_INIT([freeswitch], [1.10.10-release], [email protected])
6+
AC_INIT([freeswitch], [1.10.11-release], [email protected])
77
AC_SUBST(SWITCH_VERSION_MAJOR, [1])
88
AC_SUBST(SWITCH_VERSION_MINOR, [10])
9-
AC_SUBST(SWITCH_VERSION_MICRO, [10-release])
9+
AC_SUBST(SWITCH_VERSION_MICRO, [11-release])
1010
AC_SUBST(SWITCH_VERSION_REVISION, [])
1111
AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
1212

@@ -716,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
716716
AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
717717
])
718718

719-
PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.15],[
719+
PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.17],[
720720
AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
721721
AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
722722
])

0 commit comments

Comments
 (0)