From: Christian Richter Date: Tue, 5 Jun 2007 16:21:15 +0000 (+0000) Subject: Merged revisions 67334 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2494 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27b334c66e5d5dab619d3a5e0db902616c84a73e;p=thirdparty%2Fasterisk.git 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. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67350 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/misdn/chan_misdn_config.h b/channels/misdn/chan_misdn_config.h index 17d99b4fb2..eb2b505721 100644 --- a/channels/misdn/chan_misdn_config.h +++ b/channels/misdn/chan_misdn_config.h @@ -66,9 +66,9 @@ enum misdn_cfg_elements { #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 */