linphone-iphone/linphone.xcodeproj
Jehan Monnier 0ad82b4cff Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	.gitmodules
	Classes/LinphoneAppDelegate.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-11-15 10:54:56 +01:00
..
project.pbxproj Merge remote-tracking branch 'private/dev_videoios' 2011-11-15 10:54:56 +01:00