]> sjero.net Git - linphone/commit
Merge remote-tracking branch 'newui/newUI' into newUI
authorSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 11 Jul 2012 09:52:27 +0000 (11:52 +0200)
committerSylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Wed, 11 Jul 2012 09:53:33 +0000 (11:53 +0200)
commit9de677a8120c3b64265dde18cb63cb6306a09027
treefa7e8545dcfab656428ad37fd11d84d93a8a4b9d
parentf37b38d9e558cc91290c80b37556d7f4fb06b809
parentcff354ab3cf2fc2311862af6bf1bcff1967f3760
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
LinphoneCallLogImpl.java