]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 23 May 2011 14:44:00 +0000 (16:44 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 23 May 2011 14:44:00 +0000 (16:44 +0200)
commit08b8b1220d6043afdff207d74a244b13a20b90db
tree35170b29f8ed805a717d359e0b0a4590f778b5c8
parentc61a2b4b1e8299be77811a1927d1084b184250a2
parent58dca09f9bca63c599e96b9269ac1dc9ae0e8e94
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2
gtk/linphone.h