[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "initial_file_media_service" updated.

Thu Nov 10 09:22:40 CST 2011

branch "initial_file_media_service" has been updated
       via  93bf568eda6169dafafeb1da97e6ad230f54596d (commit)
       via  ce1fc5f0b8eab846aab388bbb4be00251dd6c728 (commit)
       via  392bea5bac84da946d5990ddd7afb977bdcb102c (commit)
       via  006cccac7e498e0faa88a747bdf39ba805198e41 (commit)
       via  2078b4a3901eaa3984036ce505ea61e07eac1258 (commit)
       via  cb5988e9a49ed1a914a52de38e26585408ea7270 (commit)
       via  5c9ba71d0434e5716d9ee58eb4ae5a60039967f5 (commit)
       via  38c625182693d9900c734ded0055a66ca24fe01e (commit)
       via  11fde89592c2d13346d7322b8d3591f2f104c5b0 (commit)
       via  ef8832a77930c026fc93c1585ed9bdc448a91834 (commit)
       via  1312c9c9d0f4c97f96f09a1291f6fe86710efda9 (commit)
       via  1b7505e4fffb20d625ee87a9fc4609ac342d97c1 (commit)
       via  e1d7bec2ebf996566cdf548790c8e4b8d6f7af70 (commit)
       via  770ff627e103bd4839c475425d20035d4155cdc3 (commit)
       via  423c5aa4002e8660daf71f2615a639864d98b4a4 (commit)
      from  6c6db2be58742f6b5d9b3070579dc183ed6f4320 (commit)

Summary of changes:
 slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice |  118 ++++++++++++
 slice/AsteriskSCF/Media/NetworkIf.ice              |   97 ++++++++++
 slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice     |  192 ++++++++++++++++++++
 slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice      |   32 +++-
 .../PartyIdentificationIf.ice                      |   20 ++-
 .../SessionCommunicationsExtensionPointsIf.ice     |  182 +++++++++++++++++++
 .../SessionCommunicationsIf.ice                    |   26 ++--
 .../SessionCommunications/TelephonyEventsIf.ice    |   10 +-
 slice/AsteriskSCF/System/ExceptionsIf.ice          |   10 +
 9 files changed, 662 insertions(+), 25 deletions(-)
 create mode 100644 slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice
 create mode 100644 slice/AsteriskSCF/Media/NetworkIf.ice
 create mode 100644 slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
 mode change 100644 => 100755 slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice


- Log -----------------------------------------------------------------
commit 93bf568eda6169dafafeb1da97e6ad230f54596d
Merge: ce1fc5f 392bea5
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Nov 8 12:01:08 2011 -0330

    Resolve conflict with release/master


commit ce1fc5f0b8eab846aab388bbb4be00251dd6c728
Merge: 6c6db2b 770ff62
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Nov 8 11:52:12 2011 -0330

    Merge branch 'master' into initial_file_media_service


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


-- 
asterisk-scf/integration/slice.git