]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 6 Apr 2011 13:15:22 +0000 (15:15 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 6 Apr 2011 13:15:22 +0000 (15:15 +0200)
commitc807039a86749ea5cdb58291af66f066060e49d2
treece0b32025a1db2c94ff70219928c6867fcd21f47
parent0025ff06f61bfd9cc91637cc7bb23712eb837675
parente91cae19ddd961d01112c25634ccb78740dab281
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2