linphone-android/res/values
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
..
color.xml Some issues fixed + chat notification + account assistant started 2012-06-21 16:44:23 +02:00
custom.xml Chat scroll to last message + specif date display for messages received/sent today 2012-07-06 15:52:08 +02:00
digit_style.xml First changes for the new UI 2012-06-21 10:05:25 +02:00
non_localizable_custom.xml Merge remote-tracking branch 'newui/newUI' into newUI 2012-07-11 11:53:33 +02:00
non_localizable_strings.xml Possibility to change ringtone, stored in preferences 2012-07-05 09:34:10 +02:00
slidingtab_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
strings.xml Generic sip account assistant working 2012-06-22 10:41:07 +02:00