Margaux Clerc c3dc710337 Merge remote-tracking branch 'linphone/master' into 3.0.X ... Conflicts: AndroidManifest.xml res/layout/chat_bubble_alt_incoming.xml res/layout/chat_bubble_alt_outgoing.xml res/layout/chat_bubble_incoming.xml res/layout/chat_bubble_outgoing.xml res/values/strings.xml src/org/linphone/ContactsManager.java src/org/linphone/compatibility/ApiFivePlus.java src/org/linphone/ui/BubbleChat.java		2015-09-10 18:58:01 +02:00
..
anim	Bounce animation for missed calls	2012-07-13 14:19:57 +02:00
drawable	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
drawable-land-xhdpi	Started incall menu to choose audio route between receiver, speaker and bluetooth (if connected and available)	2013-03-25 15:49:10 +01:00
drawable-sw533dp-land-xhdpi	Lower the minimal screen size requiered to switch to tablet layout (for kindles)	2013-10-14 17:12:32 +02:00
drawable-xhdpi	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
layout	Merge remote-tracking branch 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02: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	Rework Incall view/Chat view/Edit Contact view	2015-08-25 17:23:07 +02: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 'linphone/master' into 3.0.X	2015-09-10 18:58:01 +02:00
values-ar	i18n: update translations	2015-09-04 15:50:08 +02:00
values-de	i18n: update translations	2015-09-04 15:50:08 +02:00
values-es	i10n: update translations	2015-04-15 09:38:43 +02:00
values-fr	i18n: update translations	2015-09-04 15:50:08 +02:00
values-he	i10n: update translations	2015-04-15 09:38:43 +02:00
values-ja	i18n: update translations	2015-09-04 15:50:08 +02:00
values-nl	i18n: update translations	2015-09-04 15:50:08 +02:00
values-ru	i18n: update translations	2015-09-04 15:50:08 +02:00
values-sr	i18n: update translations	2015-09-04 15:50:08 +02: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	i18n: update translations	2015-09-04 15:50:08 +02:00
xml	Add preferences to choose the video preset and the preferred video FPS + update linphone submodule.	2015-06-11 15:23:09 +02:00