Margaux Clerc 410f168acf Merge remote-tracking branch 'private/3.0.X' into obiane ... Conflicts: AndroidManifest.xml res/drawable/status_level.xml res/layout/call.xml res/layout/chat.xml res/layout/chat_bubble_outgoing.xml res/layout/contact_control_row.xml res/layout/search_contact_cell.xml res/values/strings.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/LinphoneService.java		2015-11-16 09:06:12 +01:00
..
anim	Bounce animation for missed calls	2012-07-13 14:19:57 +02:00
drawable	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-16 09:06:12 +01:00
drawable-xhdpi	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-16 09:06:12 +01:00
layout	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-16 09:06:12 +01:00
layout-land	Rename and delete	2015-08-17 15:01:41 +02:00
layout-sw533dp-land	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
layout-sw720dp-land	Rename/Delete/add assets	2015-08-25 17:22:32 +02:00
raw	Interface update	2015-11-05 16:23:59 +01:00
raw-sw600dp	Kill service when task manager kills UI and restart it when receiving push notification	2015-07-06 15:44:02 +02:00
values	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-16 09:06:12 +01:00
values-fr	Update ui	2015-11-09 14:27:03 +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
xml	Refresh accounts works and remove about/assistant from settings	2015-10-15 16:31:39 +02:00