Jehan Monnier 8f74160e83 Merge remote-tracking branch 'origin/master' into belle-sip ... Conflicts: .gitmodules linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/build/builders.d/libvpx.mk submodules/build/builders.d/mssilk.mk submodules/build/builders.d/opencore-amr.mk submodules/build/iphone-config.site submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone		2013-06-04 10:31:39 +02:00
..
belle-sip.mk	add polarssl into the build and update srtp to fix duplicated symbols	2013-05-09 18:08:47 +02:00
ffmpeg.mk	first belle-sip version	2013-02-27 14:51:03 +01:00
ffmpeg.patch	Merge remote-tracking branch 'public/master' into dev_videoios	2011-10-19 11:36:27 +02:00
libantlr3c.mk	first belle-sip version	2013-02-27 14:51:03 +01:00
libvpx.mk	Merge remote-tracking branch 'origin/master' into belle-sip	2013-06-04 10:31:39 +02:00
libvpx.patch	update libvpx to v1.2.0	2013-05-22 16:13:35 +02:00
msamr.mk	first belle-sip version	2013-02-27 14:51:03 +01:00
msbcg729.mk	first belle-sip version	2013-02-27 14:51:03 +01:00
mssilk.mk	Merge remote-tracking branch 'origin/master' into belle-sip	2013-06-04 10:31:39 +02:00
msx264.mk	first belle-sip version	2013-02-27 14:51:03 +01:00
opencore-amr.mk	Merge remote-tracking branch 'origin/master' into belle-sip	2013-06-04 10:31:39 +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
opus.mk	port sdk to clang except for mssilk & opencore-amr	2013-06-03 09:00:48 +02:00
polarssl.mk	add polarssl into the build and update srtp to fix duplicated symbols	2013-05-09 18:08:47 +02:00
srtp.mk	port sdk to clang except for mssilk & opencore-amr	2013-06-03 09:00:48 +02:00
srtp.patch	fix srtp install	2011-11-14 16:51:03 +01:00
x264.mk	Merge remote-tracking branch 'public/master' into belle-sip	2013-05-07 22:55:03 +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