[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  a36a1c558a7d563e4ac69db343103cf2ebb29cda (commit)
       via  486c8f5bec883c8f01a3a933aa5cdce1aff12bdd (commit)
       via  68adbcebbfa998bf8dcefdb0b8c9be7a237f487a (commit)
       via  2189bc87234ec3ab1635b8ae76a24369b4ac0a81 (commit)
       via  e605e6f1425c816fd588b9d5ee4c35215e1e9a40 (commit)
      from  c6c8e75f37eaecb2e1dceb97c21b6d58b6af4463 (commit)

Summary of changes:
 CMakeLists.txt                        |    5 ++---
 local-slice/CMakeLists.txt            |    2 --
 local-slice/RtpStateReplicationIf.ice |    7 ++++---
 src/CMakeLists.txt                    |   27 ++++++++++++++-------------
 src/MediaRTPpjmedia.cpp               |   17 +++++++++--------
 src/RTPSession.cpp                    |    9 +++++----
 src/RTPSink.cpp                       |    9 +++++----
 src/RTPSource.cpp                     |   11 ++++++-----
 src/RtpStateReplicator.h              |    4 +++-
 src/RtpStateReplicatorApp.cpp         |    9 +++++----
 src/RtpStateReplicatorListener.cpp    |    4 ++--
 test/CMakeLists.txt                   |    9 +++++----
 test/TestRTPpjmedia.cpp               |    7 ++++---
 13 files changed, 64 insertions(+), 56 deletions(-)
 delete mode 100644 local-slice/CMakeLists.txt


- Log -----------------------------------------------------------------
commit a36a1c558a7d563e4ac69db343103cf2ebb29cda
Merge: c6c8e75 486c8f5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Wed Jan 19 16:53:21 2011 -0600

    Merge branch 'replication' into replication-visitor
    
    Conflicts:
    	local-slice/CMakeLists.txt


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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git