linphone-ios/submodules/build
Guillaume BIENKOWSKI 1ec60999ab Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk

+ Made modifications to the tunnel compilation so that it builds without openssl.
2013-11-05 10:54:23 +01:00
..
builders.d Merge remote-tracking branch 'public/master' into tunnel 2013-11-05 10:54:23 +01:00
builder-iphone-os.mk Merge remote-tracking branch 'public/master' into tunnel 2013-11-05 10:54:23 +01:00
builder-iphone-simulator.mk add build scripts 2010-07-18 22:31:52 +02:00
iphone-config.site Fix i386 compilation, which was triggering link errors for the iPhoneSimulator target. 2013-10-03 14:49:34 +02:00
iphone-toolchain.cmake fix audio for IOS5 2011-10-14 16:14:54 +02:00
Makefile Merge remote-tracking branch 'public/master' into tunnel 2013-11-05 10:54:23 +01:00
Makefile.xcode4.4 remove armv6 build 2012-09-26 16:43:55 +02:00