linphone-iphone/linphone.xcodeproj
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
..
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge remote-tracking branch 'public/master' into tunnel 2014-04-14 12:52:00 +02:00