merged 956:1023 (partial merge - anything non-boost related)

git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@1026 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Moises Silva committed 2010-02-09 22:01:15 +00:00
1 parent 0900125be4
commit 0d392527dc
13 files changed
+177 -66

No files matched your search

@@ -48,7 +48,6 @@ struct ftdm_analog_data {
uint32_t max_dialstr;
uint32_t digit_timeout;
char hotline[FTDM_MAX_HOTLINE_STR];
fio_signal_cb_t sig_cb;
};