linphone-iphone/submodules/build
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
..
builders.d Merge remote-tracking branch 'origin/master' into belle-sip 2013-06-04 10:31:39 +02:00
builder-iphone-os.mk Merge remote-tracking branch 'origin/master' into belle-sip 2013-06-04 10:31:39 +02:00
builder-iphone-simulator.mk add build scripts 2010-07-18 22:31:52 +02:00
iphone-config-gcc.site port sdk to clang except for mssilk & opencore-amr 2013-06-03 09:00:48 +02:00
iphone-config.site Merge remote-tracking branch 'origin/master' into belle-sip 2013-06-04 10:31:39 +02:00
iphone-toolchain.cmake fix audio for IOS5 2011-10-14 16:14:54 +02:00
Makefile add polarssl into the build and update srtp to fix duplicated symbols 2013-05-09 18:08:47 +02:00
Makefile.xcode4.4 remove armv6 build 2012-09-21 22:29:33 +02:00