David Yat Sin 5226489c39 Merge branch 'releases.3.4' into releases.3.5 ...

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftdm_state.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c

2012-04-26 16:13:26 -04:00

..

ftmod_analog

freetdm: *shrug*

2011-08-06 21:38:04 -04:00

ftmod_analog_em

FreeTDM: gcc-4.6 fixes (-Wunused-but-set)

2011-05-14 23:20:03 +02:00

ftmod_isdn

ftmod_isdn: Fix warnings

2011-04-08 14:53:59 +02:00

ftmod_libpri

ftmod_libpri: Improve output of ftdm libpri api 'invalid span' error messages.

2011-11-18 23:58:01 +01:00

ftmod_misdn

ftmod_misdn: More reworking of b-channel audio tx handling.

2012-03-28 23:49:55 +02:00

ftmod_pika

VS2010 Initial version for freetdm

2010-11-29 21:55:34 -06:00

ftmod_pritap

freetdm: fix pri tap progress event handling

2011-11-09 11:16:58 -05:00

ftmod_r2

freetdm: OPENZAP-158 --resolve map operator calling party category in the openr2 module

2011-06-16 12:32:04 -04:00

ftmod_sangoma_isdn

Merge branch 'fsorig'

2012-04-03 18:08:49 -04:00

ftmod_sangoma_ss7

Merge branch 'releases.3.4' into releases.3.5

2012-04-26 16:13:26 -04:00

ftmod_skel

start API cleanup by moving private headers and data structures into private/ include directory

2010-04-28 18:17:49 -04:00

ftmod_wanpipe

Merge branch 'fsorig'

2012-04-03 18:08:49 -04:00

ftmod_zt

freetdm: Do not report error for DAHDI RINGER ON/OFF events, they are no-ops at the moment

2012-03-19 09:27:29 -04:00