Merge remote-tracking branch 'moystash/em-suspend-support'

Conflicts:
	libs/freetdm/src/include/private/ftdm_core.h
This commit is contained in:
Moises Silva committed 2014-11-09 03:50:07 -05:00
commit eb30491688
7 files changed
+199 -24

No files matched your search

@@ -43,7 +43,7 @@ typedef enum {
FTDM_ANALOG_POLARITY_CALLERID = (1 << 4)
} ftdm_analog_flag_t;
#define FTDM_MAX_HOTLINE_STR 20
#define FTDM_MAX_HOTLINE_STR 32
#define MAX_DTMF 256
struct ftdm_analog_data {