]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'master' into netborder
authorDavid Yat Sin <dyatsin@sangoma.com>
Mon, 13 Dec 2010 17:00:59 +0000 (12:00 -0500)
committerDavid Yat Sin <dyatsin@sangoma.com>
Mon, 13 Dec 2010 17:00:59 +0000 (12:00 -0500)
commit6d21b59fee891e343e963e2dd13018f005bbdffb
treecd0b3d5af63c14cdbabe9e17b38af3976619da03
parenta94bbfe1df3e7498d3246096da510bd8c52d9917
parentce25c9186f38b75bcf9d4967210a8c07020cb0c4
Merge branch 'master' into netborder

Conflicts:
libs/freetdm/src/testsangomaboost.c
Freeswitch.2008.sln
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/testsangomaboost.c