]> sjero.net Git - linphone/commit
Merge remote-tracking branch 'origin/master' into dev_videoios
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 16 Sep 2011 09:47:30 +0000 (11:47 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 16 Sep 2011 09:47:30 +0000 (11:47 +0200)
commitcbdd8325df3fb8d344be5dd61b72bd641e5968a2
tree2b71ae97409f1759ad7b35bdba0c50e591a52b4f
parent406c3a1019964463a0565488f7bf746fc8bab360
parent9db25e99e4ba2997c20ed7aab7301f772facda81
Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
coreapi/linphonecore.c
mediastreamer2
coreapi/lsd.c
mediastreamer2