linphone-iphone/submodules/build
Simon Morlat e03056ae6e Merge branch 'master' into tunnel
not fully working
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
	submodules/build/Makefile
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/openssl.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-12-12 18:28:03 +01:00
..
builders.d Merge branch 'master' into tunnel 2011-12-12 18:28:03 +01:00
builder-iphone-os.mk Merge branch 'master' into tunnel 2011-12-12 18:28:03 +01:00
builder-iphone-simulator.mk add build scripts 2010-07-18 22:31:52 +02:00
iphone-config.site update speex repo to use our version 2011-11-21 12:53:43 +01:00
iphone-toolchain.cmake fix audio for IOS5 2011-10-14 16:14:54 +02:00
Makefile Merge branch 'master' into tunnel 2011-12-12 18:28:03 +01:00