]> sjero.net Git - linphone/commit
Merge branch 'master' of belledonne-communications.com:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 29 Jun 2010 09:25:58 +0000 (11:25 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 29 Jun 2010 09:25:58 +0000 (11:25 +0200)
commit015fbba405d6f5250ed1be6e4a824234e7180788
treed2f775e2b5d45a0140bf03cb13d78c0df0293562
parent27de7063632c0f13183203582fba85de5ca465b1
parent94fdd26f225d63a2be2fb2bb1ef4e27275431ac7
Merge branch 'master' of belledonne-communications.com:linphone-private

Conflicts:
mediastreamer2