]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
FS-5498
authorAnthony Minessale <anthm@freeswitch.org>
Fri, 19 Jul 2013 17:03:46 +0000 (12:03 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Fri, 19 Jul 2013 17:15:10 +0000 (12:15 -0500)
commit3968f41590ab16b3c900e0404de7edd6398edef9
tree8b46670d81ab10d9930592e310d29fa94fd5988b
parenta4d35c757568387927fd3bb8adc251c8348b84ca
FS-5498

Conflicts:
src/mod/endpoints/mod_sofia/mod_sofia.h
src/mod/endpoints/mod_sofia/sofia.c
src/mod/endpoints/mod_sofia/sofia_presence.c
src/mod/endpoints/mod_sofia/sofia_reg.c
src/include/switch_ivr.h
src/mod/endpoints/mod_sofia/mod_sofia.h
src/mod/endpoints/mod_sofia/sofia.c
src/mod/endpoints/mod_sofia/sofia_presence.c
src/mod/endpoints/mod_sofia/sofia_reg.c
src/switch_ivr.c
src/switch_xml.c