Simon Morlat 3376388982 Merge remote-tracking branch 'public/master' into tunnel ... Conflicts: Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk		2014-04-14 12:52:00 +02:00
..
InAppSettings.bundle	Merge remote-tracking branch 'public/master' into tunnel	2014-04-14 12:52:00 +02:00