linphone-iphone/submodules/build
Simon Morlat eecb65d1d4 Merge remote-tracking branch 'public/master' into dev_videoios
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/LinphoneUI/UILinphone.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
..
builders.d Merge remote-tracking branch 'public/master' into dev_videoios 2011-11-01 22:20:12 +01:00
builder-iphone-os.mk Merge remote-tracking branch 'public/master' into dev_videoios 2011-11-01 22:20:12 +01:00
builder-iphone-simulator.mk add build scripts 2010-07-18 22:31:52 +02:00
iphone-config.site Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
iphone-toolchain.cmake fix audio for IOS5 2011-10-14 16:14:54 +02:00
iphone-toolchain.cmake.i386 Compilation chain for ZRTP (no implementation) 2011-08-26 18:41:46 +02:00
Makefile fix audio for IOS5 2011-10-14 16:14:54 +02:00