]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa5ec0e da5b382)
Merge branch 'master' into arnaldo.r2_reset_channel
authorArnaldo Pereira <arnaldo@sangoma.com>
Thu, 23 Dec 2010 23:23:01 +0000 (21:23 -0200)
committerArnaldo Pereira <arnaldo@sangoma.com>
Thu, 23 Dec 2010 23:23:01 +0000 (21:23 -0200)
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