linphone-iphone/nogpl-thirdparties
Simon Morlat 9af95dc58e Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/externals/exosip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
	submodules/mssilk
2012-04-26 15:09:04 +02:00
..
Settings.bundle Merge remote-tracking branch 'origin/master' into tunnel 2012-04-26 15:09:04 +02:00