linphone-android/res
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
..
anim Better incall animation for switch camera button 2012-06-22 11:26:39 +02:00
drawable Merge remote-tracking branch 'newui/newUI' into newUI 2012-07-11 11:53:33 +02:00
layout Merge remote-tracking branch 'newui/newUI' into newUI 2012-07-11 11:53:33 +02:00
raw Echo limiter by default + higher el_sustain 2012-05-04 10:52:25 +02:00
values Merge remote-tracking branch 'newui/newUI' into newUI 2012-07-11 11:53:33 +02:00
xml Merge remote-tracking branch 'newui/newUI' into newUI 2012-07-11 11:53:33 +02:00
.DS_Store Wizard for Android 2012-02-02 10:34:29 +01:00