Margaux Clerc 0da687df64 Merge branch 'master' into dev_in_app_purchase ... Conflicts: AndroidManifest.xml res/raw/linphonerc_factory res/values/non_localizable_custom.xml res/xml/preferences.xml src/org/linphone/LinphonePreferences.java src/org/linphone/SettingsFragment.java src/org/linphone/compatibility/ApiFivePlus.java src/org/linphone/setup/SetupActivity.java src/org/linphone/xmlrpc/XmlRpcHelper.java src/org/linphone/xmlrpc/XmlRpcListener.java src/org/linphone/xmlrpc/XmlRpcListenerBase.java		2016-06-28 14:56:42 +02:00
..
attrs.xml	Remove old assets and colors	2015-10-15 10:59:47 +02:00
color.xml	Update call activity with ZRTP popup	2015-11-03 18:43:04 +01:00
digit_style.xml	Back to dialer in settings and about	2015-11-17 17:27:09 +01:00
non_localizable_custom.xml	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00
non_localizable_strings.xml	pref: remove qos algorithm choice	2016-01-21 10:35:35 +01:00
slidingtab_style.xml	Fundamental incall UI changes.	2011-11-22 11:21:36 +01:00
strings.xml	Fix strings file	2016-03-23 11:59:52 +01:00
styles.xml	Improved fastscroll to use Linphone colors instead of Android holo theme	2016-03-23 12:00:24 +01:00