]> sjero.net Git - linphone/commit
Merge remote-tracking branch 'origin/master' into dev_videoios
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 4 Oct 2011 07:26:21 +0000 (09:26 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 4 Oct 2011 07:26:21 +0000 (09:26 +0200)
commite1dfc98054783b7dd3cdb85dfb0e921e8a43206a
treee929adbfda19e3ec699dd000b0f0ecfb2252da52
parent191084508f03345f817156c856f692c547766960
parentb7dacbd01a6a9f84560033413f000597f469a718
Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
mediastreamer2
oRTP
coreapi/linphonecore.c
coreapi/linphonecore.h
mediastreamer2