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
..
anim	Bounce animation for missed calls	2012-07-13 14:19:57 +02:00
drawable	Fixed pressed state for custom fastscroll	2016-03-23 12:00:24 +01:00
drawable-xhdpi	Fixed pressed state for custom fastscroll	2016-03-23 12:00:24 +01:00
layout	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00
layout-land	Fixed crash at end on video call for a specific samsung device (GT-S7580)	2016-04-01 13:58:14 +02:00
layout-sw533dp	Update content description for accessibility	2016-03-23 11:59:52 +01:00
layout-sw533dp-land	Fixed crash at end on video call for a specific samsung device (GT-S7580)	2016-04-01 13:58:14 +02:00
layout-sw720dp-land	Fixed crash at end on video call for a specific samsung device (GT-S7580)	2016-04-01 13:58:14 +02:00
mipmap-hdpi	Change launch icons	2016-01-13 09:31:47 +01:00
mipmap-mdpi	Change launch icons	2016-01-13 09:31:47 +01:00
mipmap-xhdpi	Change launch icons	2016-01-13 09:31:47 +01:00
mipmap-xxhdpi	Change launch icons	2016-01-13 09:31:47 +01:00
mipmap-xxxhdpi	Change launch icons	2016-01-13 09:31:47 +01:00
raw	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00
raw-sw600dp	Fix first read of debug value and enable/disable logs accordingly	2016-05-11 15:48:04 +02:00
values	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00
values-ar	Update translation	2016-03-23 11:59:52 +01:00
values-de	Update translation	2016-03-23 11:59:52 +01:00
values-es	Update translation	2016-03-23 11:59:52 +01:00
values-fi	Update translation	2016-03-23 11:59:52 +01:00
values-fr	Update translation	2016-03-23 11:59:52 +01:00
values-he	Update translation	2016-03-23 11:59:52 +01:00
values-ja	Update translation	2016-03-23 11:59:52 +01:00
values-nl	Update translation	2016-03-23 11:59:52 +01:00
values-pt-rBR	Update translation	2016-03-23 11:59:52 +01:00
values-ru	Update translation	2016-03-23 11:59:52 +01:00
values-sr	Update translation	2016-03-23 11:59:52 +01:00
values-sv	Update translation	2016-03-23 11:59:52 +01:00
values-sw533dp	Lower the minimal screen size requiered to switch to tablet layout (for kindles)	2013-10-14 17:12:32 +02:00
values-tr	Update translation	2016-03-23 11:59:52 +01:00
values-zh-rTW	Update translation	2016-03-23 11:59:52 +01:00
xml	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00