[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "replication-visitor" updated.

[Commits to the Asterisk SCF project code repositories]

branch "replication-visitor" has been updated
       via  4db1e9d8314a3ad95c24446a99133cd005f2362f (commit)
       via  c42bb2fae80b489275b969b2a7f14151866b0edb (commit)
       via  7de9901a31e7a72d767de614c3ebe1ea3f8e3c48 (commit)
       via  dda37f6ab74478d0c03fccafba90a7b05fad72f4 (commit)
       via  b9291284df422e18419a07fa3bf0682c3f317a60 (commit)
      from  a49aa9de79867fc8af7c3e979b390937fb33f2c4 (commit)

Summary of changes:
 src/MediaRTPpjmedia.cpp |    2 +-
 src/RTPSource.cpp       |    2 +-
 test/TestRTPpjmedia.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 4db1e9d8314a3ad95c24446a99133cd005f2362f
Merge: c42bb2f 7de9901
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 4 15:51:16 2011 -0600

    Merge branch 'master' into replication-visitor

diff --cc src/MediaRTPpjmedia.cpp
index 1e7c30b,ddd847e..f770788
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@@ -46,12 -40,9 +46,12 @@@ using namespace AsteriskSCF::SmartProxy
  
  namespace
  {
- Logger &lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
+ Logger lg = getLoggerFactory().getLogger("AsteriskSCF.MediaRTP");
  }
  
 +static const string ReplicaServiceId("MediaRtpReplica");
 +static const string MediaServiceId("RTPMediaService");
 +
  /**
   * Implementation of the RTPMediaService interface as defined in MediaRTPIf.ice
   */

commit c42bb2fae80b489275b969b2a7f14151866b0edb
Merge: a49aa9d dda37f6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Jan 4 15:50:17 2011 -0600

    Merge branch 'master' into replication-visitor


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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git