]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c4ca08 39ff78b)
Merge remote branch 'fsorig/master'
authorMoises Silva <moy@sangoma.com>
Sat, 19 Feb 2011 03:50:00 +0000 (22:50 -0500)
committerMoises Silva <moy@sangoma.com>
Sat, 19 Feb 2011 03:50:00 +0000 (22:50 -0500)
Conflicts:
src/mod/endpoints/mod_sofia/sofia_glue.c

1  2 
libs/freetdm/src/ftdm_io.c patch | diff1 | diff2 | blob | history

diff --cc libs/freetdm/src/ftdm_io.c
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git