Margaux Clerc 1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane ... Conflicts: AndroidManifest.xml res/drawable-xhdpi/topbar_avatar.png res/drawable/assistant_button.xml res/layout-land/call.xml res/layout-land/call_incoming.xml res/layout-land/call_outgoing.xml res/layout-land/chatlist_cell.xml res/layout-land/main.xml res/layout/about.xml res/layout/assistant_account_creation.xml res/layout/assistant_linphone_login.xml res/layout/assistant_remote_provisioning_login.xml res/layout/assistant_topbar.xml res/layout/call.xml res/layout/call_incoming.xml res/layout/call_outgoing.xml res/layout/chat.xml res/layout/chatlist.xml res/layout/chatlist_cell.xml res/layout/conference_paused_row.xml res/layout/contact.xml res/layout/contact_edit.xml res/layout/contacts_list.xml res/layout/dialog.xml res/layout/edit_list.xml res/layout/history.xml res/layout/history_detail.xml res/layout/main.xml res/layout/side_menu_account_cell.xml res/mipmap-hdpi/ic_launcher.png res/mipmap-mdpi/ic_launcher.png res/mipmap-xhdpi/ic_launcher.png res/mipmap-xxhdpi/ic_launcher.png res/mipmap-xxxhdpi/ic_launcher.png res/values-ar/strings.xml res/values-de/strings.xml res/values-es/strings.xml res/values-fr/custom.xml res/values-fr/strings.xml res/values-he/strings.xml res/values-ja/strings.xml res/values-nl/strings.xml res/values-ru/strings.xml res/values-tr/strings.xml res/values/custom.xml res/values/non_localizable_custom.xml res/values/strings.xml res/values/styles.xml src/org/linphone/CallActivity.java src/org/linphone/ChatFragment.java src/org/linphone/ChatListFragment.java src/org/linphone/ContactDetailsFragment.java src/org/linphone/ContactsListFragment.java src/org/linphone/HistoryDetailFragment.java src/org/linphone/HistoryListFragment.java src/org/linphone/LinphoneActivity.java src/org/linphone/LinphoneManager.java src/org/linphone/LinphoneService.java src/org/linphone/assistant/RemoteProvisioningActivity.java		2016-02-18 15:56:50 +01:00
..
bcg729@e540e0c4d5	adapt to newest mediastreamer, drop rfc-ilbc codec and use webrtc's one instead.	2016-02-04 23:03:53 +01:00
bctoolbox@1f469d085d	bctoolbox merged	2016-02-17 17:39:06 +01:00
belle-sip@c130b4eba1	add LinphoneCore.setDnsServers() method	2016-02-07 23:03:17 +01:00
bzrtp@253e1543f1	Updated bzrtp to use mbedtls instead of polarssl	2016-02-04 15:41:02 +01:00
externals	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
linphone@1c06fe5f77	update linphone	2016-02-17 22:53:48 +01:00
msamr@5e180193d0	adapt to newest mediastreamer, drop rfc-ilbc codec and use webrtc's one instead.	2016-02-04 23:03:53 +01:00
mscodec2@8971bd1a23	adapt to newest mediastreamer, drop rfc-ilbc codec and use webrtc's one instead.	2016-02-04 23:03:53 +01:00
msopenh264@709e1f6903	adapt to newest mediastreamer, drop rfc-ilbc codec and use webrtc's one instead.	2016-02-04 23:03:53 +01:00
mssilk@e766ae43c5	adapt to newest mediastreamer, drop rfc-ilbc codec and use webrtc's one instead.	2016-02-04 23:03:53 +01:00
mswebrtc@8d7889ebd5	update mswebrtc	2016-02-05 12:45:21 +01:00
msx264@244713da4c	Updated msx264 to fix compil	2016-02-17 14:04:45 +01:00