]> sjero.net Git - linphone/commit
Merge branch 'dev_videoios' into local_videoios
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 28 Oct 2011 19:57:01 +0000 (21:57 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 28 Oct 2011 19:57:01 +0000 (21:57 +0200)
commit92642e79c0db2b5d7251890c8a6455200e6f5bca
tree0fd056a7b468f4b04076ea229598b908a267b2dc
parent7cffd6ffee3932bfbbca9965f0fbbb8ea60fd061
parent74f64929191e62f473ddcd232c92c85f7d2a7fb0
Merge branch 'dev_videoios' into local_videoios

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