mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 12:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.linphone.org:linphone-private

Browse source 
Conflicts:
	coreapi/linphonecore_jni.cc
This commit is contained in:
Simon Morlat 2010-11-12 19:41:48 +01:00
commit 4bb9fbefa3
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/linphonecore_jni.cc
View file

@ -951,4 +951,3 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv*
ms_message("linphone_core_set_native_video_window_id() called !!!!!!!");
}

2
mediastreamer2

@ -1 +1 @@
Subproject commit e59157a44a7b6aa1f1fa756325047e98c2be3786
Subproject commit 7ec60743dfffefc49cc83e47f0eff0ec7928d83a