[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "default_bridge_listeners" updated.

[Commits to the Asterisk SCF project code repositories]

branch "default_bridge_listeners" has been updated
       via  576259d49add6509ae3653d60f9ff9cc3147ca7f (commit)
       via  1e902b22b93c6410584602bedaf8c1d8ae2aff8c (commit)
       via  3dc0a56e99eaa104c5c3cdd95ab9602ba2d239b8 (commit)
       via  e43122c9717a7390f52139f03bd44fea1246f8ae (commit)
       via  7f2a04ed6394cfdd356fefd382aa9fdfca2b5f47 (commit)
       via  50af0d1d84473b946a414371721b4238d3edd4c6 (commit)
       via  f5dcb73aa6740cbfdcd9acf67dee0749d7591b0a (commit)
       via  d1f56f5716ef3a5ab6efc8947e17660058b23465 (commit)
       via  6f03b48a979daa54af637d238cb93679fc5b8936 (commit)
      from  3c449028b81e37be1020cc32cc175bba3e09ee63 (commit)

Summary of changes:
 CMakeLists.txt                 |    4 ++--
 src/BridgeImpl.cpp             |    6 +++---
 src/BridgeImpl.h               |    2 +-
 src/BridgeListenerMgr.h        |    2 +-
 src/BridgeManagerImpl.cpp      |    4 +++-
 src/BridgeManagerImpl.h        |    2 +-
 src/BridgeManagerListenerMgr.h |    2 +-
 src/CMakeLists.txt             |   11 +++++------
 src/MediaSplicer.cpp           |    2 +-
 src/MediaSplicer.h             |    4 ++--
 src/Service.cpp                |    6 +++---
 test/BridgeListenerI.h         |    2 +-
 test/BridgeManagerListenerI.h  |    2 +-
 test/CMakeLists.txt            |   11 +++++------
 test/SessionListenerI.h        |    2 +-
 test/TestBridging.cpp          |    4 ++--
 test/TestCommandDriver.h       |    2 +-
 17 files changed, 34 insertions(+), 34 deletions(-)


- Log -----------------------------------------------------------------
commit 576259d49add6509ae3653d60f9ff9cc3147ca7f
Merge: 3c44902 1e902b2
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Feb 10 12:53:37 2011 -0330

    Merged updates to master.

diff --cc src/BridgeManagerImpl.cpp
index 0f3e85b,c820cc2..682b606
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@@ -19,8 -19,15 +19,10 @@@
  #include <boost/thread/locks.hpp>
  #include "BridgeListenerMgr.h"
  #include "BridgeManagerListenerMgr.h"
- #include "logger.h"
+ #include <AsteriskSCF/logger.h>
+ 
+ using namespace AsteriskSCF::System::Logging;
  
 -namespace
 -{
 -Logger lg = getLoggerFactory().getLogger("AsteriskSCF.BridgeService");
 -}
 -
  //
  // Compiled in constants.
  // TODO: Replace with configuration!

-----------------------------------------------------------------------


-- 
asterisk-scf/release/bridging.git