]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4d8fa6 478e685)
Merge branch 'master' of git.sangoma.com:smg_freeswitch
authorDavid Yat Sin <dyatsin@sangoma.com>
Tue, 31 May 2011 17:25:03 +0000 (13:25 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Tue, 31 May 2011 17:25:03 +0000 (13:25 -0400)
Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c

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

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