Merge branch 'master' into netborder

Browse Source

Conflicts:
	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
	libs/freetdm/src/include/freetdm.h

...

This commit is contained in:

Moises Silva

2011-01-05 13:11:37 -05:00

parent 9be9d799f3 f574db0958

commit eb84fc772f

224 changed files with 13786 additions and 6134 deletions

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

1008

libs/freetdm/src/ftdm_io.c

File diff suppressed because it is too large Load Diff