]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 24 May 2011 13:56:24 +0000 (15:56 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 24 May 2011 13:56:24 +0000 (15:56 +0200)
commit165a0584fecc289698515ebe823da624b5441c2a
tree28489a74d9818710aac48dcd8d360bd5277fced2
parent6b69c667e4d0a6dc280809e6aa166cc8397e6fd4
parent3981cdd2646427468fbe549c02354542b61d51a4
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2
coreapi/private.h