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
..
com/android/vending/billing	Cleaned app's project structure	2018-11-15 13:06:12 +01:00
org/linphone	Merge branch 'dev_qrcode' into feature/qrcode_integration	2018-11-30 11:24:27 +01:00