Simon Morlat 4e2de700fb Merge branch 'master' into tunnel ... Conflicts: .gitmodules Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk		2012-03-16 15:50:55 +01:00
..
builders.d	Merge branch 'master' into tunnel	2012-03-16 15:50:55 +01:00
builder-iphone-os.mk	Merge branch 'master' into tunnel	2012-03-16 15:50:55 +01:00
builder-iphone-simulator.mk	add build scripts	2010-07-18 22:31:52 +02:00
iphone-config.site	update README and config site to work with Xcode 4.3	2012-03-09 22:05:04 +01:00
iphone-toolchain.cmake	fix audio for IOS5	2011-10-14 16:14:54 +02:00
Makefile	Merge branch 'master' into tunnel	2012-03-16 15:50:55 +01:00