Moises Silva 8d66f38212 Merge branch 'master' of git://git.freeswitch.org/freeswitch ...

Conflicts:
	conf/autoload_configs/modules.conf.xml
	libs/freetdm/src/ftdm_sched.c
	libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

2010-11-09 12:59:48 -05:00

..

clean.sh

…

CMakeLists.txt

…

Makefile.in

…

mod_freetdm.2008.vcproj

…

mod_freetdm.c

Merge branch 'master' of git://git.freeswitch.org/freeswitch

2010-11-09 12:59:48 -05:00

mod_openzap.2005.vcproj

…