linphone-ios/linphone.xcodeproj
Simon Morlat 4e2de700fb Merge branch 'master' into tunnel
Conflicts:
	.gitmodules
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
2012-03-16 15:50:55 +01:00
..
project.pbxproj Merge branch 'master' into tunnel 2012-03-16 15:50:55 +01:00