mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 03:48:08 +00:00
1b207c8dc1
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
89 lines
3.2 KiB
Text
89 lines
3.2 KiB
Text
[submodule "linphone"]
|
|
path = submodules/linphone
|
|
url = git://git.linphone.org/linphone.git
|
|
[submodule "submodules/externals/gsm"]
|
|
path = submodules/externals/gsm
|
|
url = git://git.linphone.org/gsm.git
|
|
[submodule "submodules/externals/speex"]
|
|
path = submodules/externals/speex
|
|
url = git://git.linphone.org/speex.git
|
|
[submodule "submodules/externals/ffmpeg"]
|
|
path = submodules/externals/ffmpeg
|
|
url = git://git.linphone.org/ffmpeg.git
|
|
ignore = dirty
|
|
[submodule "submodules/externals/x264"]
|
|
path = submodules/externals/x264
|
|
url = git://git.linphone.org/x264.git
|
|
ignore = dirty
|
|
[submodule "submodules/msx264"]
|
|
path = submodules/msx264
|
|
url = git://git.linphone.org/msx264.git
|
|
[submodule "submodules/externals/opencore-amr"]
|
|
path = submodules/externals/opencore-amr
|
|
url = git://git.linphone.org/opencore-amr.git
|
|
ignore = dirty
|
|
[submodule "submodules/msamr"]
|
|
path = submodules/msamr
|
|
url = git://git.linphone.org/msamr.git
|
|
[submodule "submodules/externals/libvpx"]
|
|
path = submodules/externals/libvpx
|
|
url = https://chromium.googlesource.com/webm/libvpx
|
|
ignore = dirty
|
|
[submodule "submodules/bzrtp"]
|
|
path = submodules/bzrtp
|
|
url = git://git.linphone.org/bzrtp.git
|
|
[submodule "submodules/externals/srtp"]
|
|
path = submodules/externals/srtp
|
|
url = git://git.linphone.org/srtp.git
|
|
[submodule "submodules/mssilk"]
|
|
path = submodules/mssilk
|
|
url = git://git.linphone.org/mssilk.git
|
|
[submodule "submodules/externals/vo-amrwbenc"]
|
|
path = submodules/externals/vo-amrwbenc
|
|
url = git://git.linphone.org/vo-amrwbenc.git
|
|
[submodule "submodules/bcg729"]
|
|
path = submodules/bcg729
|
|
url = git://git.linphone.org/bcg729.git
|
|
[submodule "submodules/belle-sip"]
|
|
path = submodules/belle-sip
|
|
url = git://git.linphone.org/belle-sip.git
|
|
[submodule "submodules/externals/antlr3"]
|
|
path = submodules/externals/antlr3
|
|
url = git://git.linphone.org/antlr3.git
|
|
[submodule "submodules/externals/libxml2"]
|
|
path = submodules/externals/libxml2
|
|
url = git://git.gnome.org/libxml2.git
|
|
[submodule "submodules/externals/libupnp"]
|
|
path = submodules/externals/libupnp
|
|
url = git://git.linphone.org/libupnp.git
|
|
[submodule "submodules/externals/cunit"]
|
|
path = submodules/externals/cunit
|
|
url = git://git.linphone.org/cunit.git
|
|
[submodule "submodules/externals/axmlrpc"]
|
|
path = submodules/externals/axmlrpc
|
|
url = git://git.linphone.org/axmlrpc.git
|
|
[submodule "submodules/externals/polarssl"]
|
|
path = submodules/externals/polarssl
|
|
url = git://git.linphone.org/polarssl.git
|
|
[submodule "submodules/externals/opus"]
|
|
path = submodules/externals/opus
|
|
url = git://git.linphone.org/opus.git
|
|
[submodule "submodules/mswebrtc"]
|
|
path = submodules/mswebrtc
|
|
url = git://git.linphone.org/mswebrtc.git
|
|
[submodule "submodules/msopenh264"]
|
|
path = submodules/msopenh264
|
|
url = git://git.linphone.org/msopenh264.git
|
|
[submodule "submodules/externals/openh264"]
|
|
path = submodules/externals/openh264
|
|
url = https://github.com/cisco/openh264
|
|
ignore = dirty
|
|
[submodule "submodules/mscodec2"]
|
|
path = submodules/mscodec2
|
|
url = git://git.linphone.org/mscodec2.git
|
|
[submodule "submodules/bctoolbox"]
|
|
path = submodules/bctoolbox
|
|
url = git://git.linphone.org/bctoolbox.git
|
|
[submodule "submodules/externals/mbedtls"]
|
|
path = submodules/externals/mbedtls
|
|
url = https://github.com/ARMmbed/mbedtls.git
|