Sylvain Berfini
|
babcbef93e
|
Merge remote-tracking branch 'newui/newUI' into newUI
Conflicts:
AndroidManifest.xml
build.xml
src/org/linphone/DialerActivity.java
src/org/linphone/IncallActivity.java
src/org/linphone/LinphoneManager.java
src/org/linphone/LinphoneService.java
src/org/linphone/LinphoneSimpleListener.java
src/org/linphone/LinphoneUtils.java
src/org/linphone/VideoCallActivity.java
src/org/linphone/core/LinphoneCallImpl.java
src/org/linphone/core/LinphoneCoreImpl.java
|
2012-07-11 11:53:33 +02:00 |
|