mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-23 06:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-android/res/xml
History
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
..
account_preferences.xml Update strings 2016-01-19 09:26:35 +01:00
authenticator.xml Update views 2015-11-26 15:17:59 +01:00
contacts.xml Updated procedure for change package name + fixed crash when contacts sync account creation failed 2016-01-29 10:58:37 +01:00
preferences.xml Merge branch 'master' into dev_in_app_purchase 2016-06-28 14:56:42 +02:00
syncadapter.xml Updated procedure for change package name + fixed crash when contacts sync account creation failed 2016-01-29 10:58:37 +01:00