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
..
ffmpeg.mk	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
ffmpeg.patch	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
libvpx.mk	remove armv6 build	2012-09-26 16:43:55 +02:00
libvpx.patch	fix build for xcode4.4	2012-09-18 15:55:36 +02:00
msamr.mk	fix veryclean for msamr	2011-06-17 10:18:08 +02:00
msbcg729.mk	g729A integration based on bcg729	2012-02-16 15:46:45 +01:00
mssilk.mk	merge vios IOS with master	2011-11-18 14:23:41 +01:00
msx264.mk	add msx264.mk	2011-07-22 10:00:46 +02:00
opencore-amr.mk	fix bad tab in makefile !	2011-08-17 22:14:03 +02:00
openssl.mk	update openssl	2012-09-26 22:46:07 +02:00
openssl.patch	Patches for srtp and zrtp.	2011-09-06 14:51:14 +02:00
srtp.mk	implement wifi only mode	2012-05-02 09:25:39 +02:00
srtp.patch	fix srtp install	2011-11-14 16:51:03 +01:00
tunnel.mk	restore tunnel submodule in submodules/, update linphone submodule, update exosip	2012-01-31 13:42:33 +01:00
x264.mk	Fix x264 build.	2012-12-20 08:45:16 +01:00
x264.patch	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
zrtp.mk	merge vios IOS with master	2011-11-18 14:23:41 +01:00