linphone-android/res/values
Guillaume Beraudo 25f6a5445c Merge branch 'master' of git.linphone.org:linphone-android
Conflicts:
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphonePreferencesActivity.java
	submodules/linphone
	test/org/linphone/TestConferenceActivity.java
2011-11-24 11:22:07 +01:00
..
callee_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
conf_style.xml Fundamental ios-like ui change for incall view. 2011-11-24 10:55:08 +01:00
custom.xml Wait for service in main Activity; removed elsewhere 2011-11-15 11:12:42 +01:00
digit_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
non_localizable_custom.xml Cleaning + fix video activity opening. 2011-11-09 13:18:11 +01:00
non_localizable_strings.xml media encryption API enhancements 2011-11-23 22:20:00 +01:00
slidingtab_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
strings.xml Merge branch 'master' of git.linphone.org:linphone-android 2011-11-24 11:22:07 +01:00