Mickaël Turnel 04207ebcef Merge branch 'dev_qrcode' into feature/qrcode_integration ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/linphone/assistant/AssistantFragmentsEnum.java # res/layout/video.xml # src/android/org/linphone/LinphoneManager.java # src/android/org/linphone/assistant/AssistantActivity.java # src/android/org/linphone/assistant/RemoteProvisioningActivity.java # src/android/org/linphone/assistant/RemoteProvisioningFragment.java # src/android/org/linphone/assistant/WelcomeFragment.java # submodules/bcmatroska2 # submodules/belcard # submodules/cmake-builder # submodules/externals/openh264 # submodules/externals/zxing-cpp # submodules/linphone # submodules/mediastreamer2 # submodules/oRTP		2018-11-30 11:24:27 +01:00
..
src/main	Merge branch 'dev_qrcode' into feature/qrcode_integration	2018-11-30 11:24:27 +01:00
.gitignore	Cleaned app's project structure	2018-11-15 13:06:12 +01:00
build.gradle	Version bumped	2018-11-30 10:49:02 +01:00
proguard-rules.pro	Fixes for release	2018-11-19 10:27:25 +01:00