* Miscellaneous formatting changes to make v1.4 and trunk

more merge compatible in the mISDN area.

channels/chan_misdn.c
*  Eliminated redundant code in cb_events() EVENT_SETUP



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@145200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2008-09-30 21:00:54 +00:00
parent 90751b16ca
commit e3311c9875
4 changed files with 134 additions and 136 deletions

View File

@@ -410,7 +410,7 @@ struct misdn_bchannel {
/*! \brief This is used as a pending bridge join request for when bc_state becomes BCHAN_ACTIVATED */
enum bchannel_state next_bc_state;
/*! \brief Bridgign conference ID */
/*! \brief Bridging conference ID */
int conf_id;
/*! \brief TRUE if this channel is on hold */