Arnaldo Pereira 3dc8d5b09a Merge branch 'master' into arnaldo.ftdm_channel_read_event ...

Conflicts:

	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c

2010-12-01 20:34:02 -02:00

..

clean.sh

…

CMakeLists.txt

…

Makefile.in

…

mod_freetdm.2008.vcproj

…

mod_freetdm.c

Merge branch 'master' into arnaldo.ftdm_channel_read_event

2010-12-01 20:34:02 -02:00

mod_openzap.2005.vcproj

…