linphone-iphone/submodules/build
Pierre-Eric Pelloux-Prayer 17cc55d854 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	nogpl-thirdparties/Settings.bundle/Root.plist
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2012-02-06 13:22:39 +01:00
..
builders.d Merge remote-tracking branch 'public/master' into tunnel 2012-02-06 13:22:39 +01:00
builder-iphone-os.mk Merge remote-tracking branch 'public/master' into tunnel 2012-02-06 13:22:39 +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 update with new tunnel api 2011-12-22 14:18:21 +01:00