]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 24 Jan 2011 13:06:44 +0000 (14:06 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 24 Jan 2011 13:06:44 +0000 (14:06 +0100)
commit703e455e34e4dc4d05dd0c5bf72166cee23a1dc1
treeef835207f021024639fb113321e63e56afc4f411
parent1727d4a1c997917c9597395eff4452943a2d9c95
parent0a4d1c9248be0fb45eb2c410b036107176280513
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2