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
..
attrs.xml	Remove old assets and colors	2015-10-15 10:59:47 +02:00
color.xml	Interface update	2015-11-05 16:23:59 +01:00
custom.xml	Interface update	2015-11-05 16:23:59 +01:00
digit_style.xml	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
non_localizable_custom.xml	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
non_localizable_strings.xml	Clean settings and add orientation preference	2015-11-19 15:08:50 +01:00
slidingtab_style.xml	Fundamental incall UI changes.	2011-11-22 11:21:36 +01:00
strings.xml	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
styles.xml	Fix landscape graphics	2015-11-26 10:43:28 +01:00