]> sjero.net Git - linphone/commit
Merge branch 'master' of belledonne-communications.com:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 19 May 2010 12:47:00 +0000 (14:47 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 19 May 2010 12:47:00 +0000 (14:47 +0200)
commitffce78a1546d097a2698fa8616685a0cb8259af1
treeded9b20bf24bb9a8c65a8f4962f5467ea86163c2
parent9040037e437fee8fede1e98774589e3bf99d6ab1
parent2cb7be8f7d16f5174cd3651a73c6f5c7cfec98d2
Merge branch 'master' of belledonne-communications.com:linphone-private

Conflicts:
mediastreamer2