linphone-android/res/values
Sylvain Berfini 42e4cdc671 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
..
attrs.xml Added shadows to contact pictures 2012-07-23 17:51:35 +02:00
color.xml Improved tablet UI 2012-10-22 12:27:07 +02:00
custom.xml Move setup_username_hint to custom 2013-06-11 15:43:28 +02:00
digit_style.xml First changes for the new UI 2012-06-21 10:05:25 +02:00
non_localizable_custom.xml Added bool to hide sip addresses (in history) 2013-06-11 15:33:00 +02:00
non_localizable_defaults.xml add userid +upnp settings 2013-03-05 16:36:49 +01:00
non_localizable_strings.xml add userid +upnp settings 2013-03-05 16:36:49 +01:00
slidingtab_style.xml Fundamental incall UI changes. 2011-11-22 11:21:36 +01:00
strings.xml Merge remote-tracking branch 'master/master' into bellesip 2013-06-12 10:59:39 +02:00
styles.xml Interace improved 2012-08-06 13:09:51 +02:00