mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 03:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-iphone/java/common
History
Simon Morlat 6d0b58eb71 Merge branch 'dev_conference' 
Conflicts:
	coreapi/linphonecall.c
	coreapi/linphonecore.c
	java/common/org/linphone/core/LinphoneCall.java
	mediastreamer2
2011-09-16 21:51:26 +02:00
..
org Merge branch 'dev_conference' 2011-09-16 21:51:26 +02:00