[asterisk-scf-commits] asterisk-scf/release/pjproject.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  576448b22f155b3e236512cf64391a5f5be2b834 (commit)
       via  6637ba10b596fc66603248c03dbe86a543c76f76 (commit)
       via  191569a04e0110776711ae56bafeb07d32ccc893 (commit)
       via  a505e6e6056509f62a1a91c6834811115035a759 (commit)
       via  23957be23cf833643535a84399a5ca3a558a0b35 (commit)
       via  8fc656b866062aa20b0ab5d99ffa3d60da04d395 (commit)
       via  82d6fde71a4cd2e6c4089af87a077c239234dc39 (commit)
       via  7214dddf57ade076cf525d13deabda95c1d7f6d7 (commit)
       via  c4b44a49d553f7757fd05137f7e0d730956c138f (commit)
       via  ffcd8fab13759c52e07e3eddcadfaeed8d278bf1 (commit)
       via  98182890c2ce1de82d160a6f7106a2c2a6179b27 (commit)
       via  75bee31e37f0577952c635e00223593aaf93d2c6 (commit)
       via  377d617d20552414f9486593cee723c1781e7449 (commit)
       via  48aabcc9c79d5c33ae31c3fdc5880a85e5568e18 (commit)
       via  9a70990f8e88e8f5b2b350b085760420801d944b (commit)
       via  affef644ef803c2c8e45f8b7ac259cf2f27595ce (commit)
       via  8f90f061528ea7be26af518c0683650a69acd306 (commit)
       via  9e646bf5feb08626df79ac200bfedba4d9a426cc (commit)
      from  e190c19f11bc94a2e84b62f42b464ec6c496ffc8 (commit)

Summary of changes:
 pjlib/src/pj/addr_resolv_sock.c                    |    1 +
 pjlib/src/pj/sock_common.c                         |    2 +-
 pjsip/build/Makefile                               |    4 +-
 pjsip/include/pjsip/sip_transport_tcp.h            |    4 +-
 pjsip/src/pjsip/sip_transport_tcp.c                |  180 +++++++++++++------
 pjsip/src/test/test.c                              |    2 +
 pjsip/src/test/test.h                              |    2 +
 pjsip/src/test/transport_tcp_test.c                |   21 ++-
 ...ransport_tcp_test.c => transport_tcp_test_v6.c} |   22 +--
 pjsip/src/test/transport_test.c                    |   19 ++-
 ...ransport_udp_test.c => transport_udp_test_v6.c} |   16 +-
 11 files changed, 180 insertions(+), 93 deletions(-)
 copy pjsip/src/test/{transport_tcp_test.c => transport_tcp_test_v6.c} (89%)
 copy pjsip/src/test/{transport_udp_test.c => transport_udp_test_v6.c} (88%)


- Log -----------------------------------------------------------------
commit 576448b22f155b3e236512cf64391a5f5be2b834
Merge: 6637ba1 e190c19
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Jan 3 11:10:20 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/pjproject


commit 6637ba10b596fc66603248c03dbe86a543c76f76
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Jan 3 09:48:33 2011 -0600

    Merge branches 'veesix' and 'master'

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


-- 
asterisk-scf/release/pjproject.git