]> sjero.net Git - linphone/commit
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 14 Nov 2012 13:03:38 +0000 (14:03 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 14 Nov 2012 13:03:38 +0000 (14:03 +0100)
commit0268f1471374acab83f3aec0dacfa62f46ef1271
treeb4e13628afa201680c6f1884177a345bb53d4629
parent486492c448b36feccd15e59b3cc1c2bab7b03682
parent8712757602d7fc6d80a1d0d61d9af70473782b00
Merge branch 'master' of git.linphone.org:linphone

Conflicts:
mediastreamer2