[asterisk-commits] crichter: trunk r67350 - in /trunk: ./ channels/misdn/chan_misdn_config.h

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Tue Jun  5 11:21:15 2007
New Revision: 67350

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67350
Log:
Merged revisions 67334 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r67334 | crichter | 2007-06-05 18:14:07 +0200 (Di, 05 Jun 2007) | 9 lines

Merged revisions 67307 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r67307 | crichter | 2007-06-05 17:42:03 +0200 (Di, 05 Jun 2007) | 1 line

briding is a bool, fixed copy and paste issue.
........

................

Modified:
    trunk/   (props changed)
    trunk/channels/misdn/chan_misdn_config.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/misdn/chan_misdn_config.h
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/chan_misdn_config.h?view=diff&rev=67350&r1=67349&r2=67350
==============================================================================
--- trunk/channels/misdn/chan_misdn_config.h (original)
+++ trunk/channels/misdn/chan_misdn_config.h Tue Jun  5 11:21:15 2007
@@ -66,9 +66,9 @@
 #endif
 	MISDN_CFG_NEED_MORE_INFOS,     /* bool */
 	MISDN_CFG_NOAUTORESPOND_ON_SETUP,     /* bool */
-	MISDN_CFG_NTTIMEOUT,     /* bool */
-	MISDN_CFG_BRIDGING,              /* int */
-	MISDN_CFG_JITTERBUFFER,              /* int */
+	MISDN_CFG_NTTIMEOUT,     	/* bool */
+	MISDN_CFG_BRIDGING,              /* bool */
+	MISDN_CFG_JITTERBUFFER,             /* int */
 	MISDN_CFG_JITTERBUFFER_UPPER_THRESHOLD,              /* int */
 	MISDN_CFG_CALLGROUP,           /* ast_group_t */
 	MISDN_CFG_PICKUPGROUP,         /* ast_group_t */