linphone-iphone/java/common/org
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
..
linphone Merge branch 'dev_conference' 2011-09-16 21:51:26 +02:00
.DS_Store mv most of the code to common directory. add LinphoneCoreException specific implementation both for j2me and j2se 2010-04-30 18:00:09 +02:00