]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into netborder
authorArnaldo Pereira <arnaldo@sangoma.com>
Fri, 3 Dec 2010 14:40:14 +0000 (12:40 -0200)
committerArnaldo Pereira <arnaldo@sangoma.com>
Fri, 3 Dec 2010 14:40:14 +0000 (12:40 -0200)
Conflicts:

libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
libs/freetdm/src/include/freetdm.h

1  2 
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h

Simple merge