]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 31 Jan 2011 14:54:16 +0000 (15:54 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 31 Jan 2011 14:54:16 +0000 (15:54 +0100)
commita532eb55bdc7766140d71159e8a5d55bd5b636c9
treeb47cd6a99219b2c79771dea53b3a58f74a157785
parent28903fc8a1a36bb47e68825966e42f0ce472126e
parentaba5cc518c76cd685973fa0dd092faddeccb039e
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
console/Makefile.am
mediastreamer2