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
..
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	port to Xcode 4.3 (libvpx patch added)	2012-03-13 23:30:16 +01:00
libvpx.patch	port to Xcode 4.3 (libvpx patch added)	2012-03-13 23:30:16 +01: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	merge vios IOS with master	2011-11-18 14:23:41 +01:00
openssl.patch	Patches for srtp and zrtp.	2011-09-06 14:51:14 +02:00
srtp.mk	Merge remote-tracking branch 'private/dev_videoios'	2011-11-15 10:54:56 +01: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	- update linphone and ms2 submodules for rate control	2011-10-28 22:01:58 +02: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