linphone-iphone/linphone.xcodeproj
Jehan Monnier 8f74160e83 Merge remote-tracking branch 'origin/master' into belle-sip
Conflicts:
	.gitmodules
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/libvpx.mk
	submodules/build/builders.d/mssilk.mk
	submodules/build/builders.d/opencore-amr.mk
	submodules/build/iphone-config.site
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-06-04 10:31:39 +02:00
..
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge remote-tracking branch 'origin/master' into belle-sip 2013-06-04 10:31:39 +02:00