Yann Diorcet 233f22e5d7 Merge branch 'master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m Settings.bundle/Root.plist Settings/InAppSettings.bundle/Root.plist linphone.xcodeproj/project.pbxproj submodules/build/builders.d/x264.mk		2013-01-15 12:58:42 +01:00
..
builders.d	Merge branch 'master' into tunnel	2013-01-15 12:58:42 +01:00
builder-iphone-os.mk	Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel	2012-12-17 11:49:40 +01:00
builder-iphone-simulator.mk	add build scripts	2010-07-18 22:31:52 +02:00
iphone-config.site	xcode 4.6/ios6 support	2012-09-18 15:55:11 +02:00
iphone-toolchain.cmake	fix audio for IOS5	2011-10-14 16:14:54 +02:00
Makefile	Merge branch 'branch_1.x' of git.linphone.org:linphone-iphone into tunnel	2012-12-17 11:49:40 +01:00
Makefile.xcode4.4	remove armv6 build	2012-09-26 16:43:55 +02:00