]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
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)
Conflicts:
libs/freetdm/src/testsangomaboost.c

1  2 
Freeswitch.2008.sln
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/testsangomaboost.c

Simple merge
Simple merge
Simple merge