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 |
|