Conflicts:
	Core/LinphoneCore.cpp
	Core/LinphoneCore.h
	Core/Utils.cpp
	Core/Utils.h
	Linphone/Linphone.csproj
	Linphone/Model/LinphoneManager.cs
	Linphone/Resources/AppResources.Designer.cs
	Linphone/Resources/AppResources.resx
	submodules/linphone