Margaux Clerc 8793a506e3 Merge remote-tracking branch 'linphone-android/master' into obiane ... Conflicts: res/drawable-xhdpi/checkbox_checked.png res/drawable-xhdpi/checkbox_unchecked.png res/drawable-xhdpi/resizable_textfield.9.png res/drawable/avatar_mask_chat.xml res/layout/about.xml res/layout/call.xml res/layout/call_inactive_row.xml res/layout/chat.xml res/layout/chat_bubble_incoming.xml res/layout/chat_bubble_outgoing.xml res/layout/chatlist.xml res/layout/contact.xml res/layout/contacts_list.xml res/layout/dialer.xml res/layout/history.xml res/layout/history_detail.xml res/layout/main.xml res/layout/search_contact_cell.xml res/layout/side_menu_account_cell.xml res/layout/side_menu_item_cell.xml res/layout/side_menu_main_account.xml res/values/non_localizable_custom.xml res/values/strings.xml res/values/styles.xml src/org/linphone/ChatFragment.java src/org/linphone/ContactsListFragment.java src/org/linphone/DialerFragment.java src/org/linphone/HistoryDetailFragment.java src/org/linphone/LinphoneActivity.java src/org/linphone/LinphoneService.java		2015-11-30 14:29:14 +01:00
..
anim	Bounce animation for missed calls	2012-07-13 14:19:57 +02:00
drawable	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
drawable-xhdpi	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
layout	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
layout-land	Clean old icons	2015-11-26 14:56:31 +01: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	Disable animations	2015-11-18 10:15: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 'linphone-android/master' into obiane	2015-11-30 14:29:14 +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	Update views	2015-11-26 15:17:59 +01:00