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

Browse Source

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

...

This commit is contained in:

Moises Silva committed 2010-11-09 12:59:48 -05:00

2 parents 633599021a dd4fb5bee5

commit 8d66f38212

232 files changed

+57975 -3495

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

+508 -247

File diff suppressed because it is too large. Load diff