]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 13 Oct 2011 11:18:28 +0000 (13:18 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 13 Oct 2011 11:18:28 +0000 (13:18 +0200)
commit514f67a88ad48a4a5a5eef9cfe77fd92b4a11081
tree607a02be0895ff2a948b221529f927bf3fe05d89
parentd0b53669f917d21a8b6ccf0d1032a173076ec230
parentcd66a94919d82b229f5005499ab2d4123ca8bec0
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2
oRTP