git.ipfire.org Git - thirdparty/freeswitch.git/commit

]> git.ipfire.org Git - thirdparty/freeswitch.git/commit

projects / thirdparty / freeswitch.git / commit

author	David Yat Sin <dyatsin@sangoma.com>
	Wed, 25 Jul 2012 15:15:18 +0000 (11:15 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Wed, 25 Jul 2012 15:15:18 +0000 (11:15 -0400)
commit	8b0fbe605c35c2c1e8f1afd4962fe9cce008bc5c
tree	118cd572d570ac0d51315c302ac72e6c93a051c2	tree
parent	dd0b5147410de6915ecfc108d8b694dbc39dfcc0	commit \| diff
parent	eb0404d0256dee4696b3ae1b62c4b1cef9327a0d	commit \| diff

Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

Conflicts:
.gitignore
conf/insideout/autoload_configs/modules.conf.xml
conf/vanilla/autoload_configs/modules.conf.xml
src/mod/endpoints/mod_sofia/mod_sofia.h
src/switch_rtp.c

Mirror of https://github.com/signalwire/freeswitch.git

RSS Atom

conf/vanilla/autoload_configs/modules.conf.xml	diff1 \|	diff2 \|	blob \| history
libs/freetdm/Makefile.am	diff1 \|	diff2 \|	blob \| history
libs/freetdm/mod_freetdm/mod_freetdm.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_io.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/include/freetdm.h	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/include/private/ftdm_types.h	diff1 \|	diff2 \|	blob \| history
src/include/switch_apr.h	diff1 \|	diff2 \|	blob \| history
src/include/switch_types.h	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.c	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.h	diff1 \|	diff2 \|	blob \| history
src/switch_rtp.c	diff1 \|	diff2 \|	blob \| history