Sylvain Berfini 75934a5400 Merge remote-tracking branch 'master/master' into bellesip ... Conflicts: .classpath res/values/non_localizable_custom.xml res/values/strings.xml src/org/linphone/HistoryDetailFragment.java submodules/linphone		2013-06-12 10:59:39 +02:00
..
antlr3	Merge branch 'master' into bellesip	2013-02-06 12:22:28 +01:00
cunit	Add suites and tests in liblinphone_tester	2013-03-08 16:09:35 +01:00
ffmpeg	Added MJPEG encoder to ffmepg to be able to take snapshots	2012-06-29 09:53:20 +02:00
ffmpeg-no-neon	Add jpeg encoder to no-neon ffmpeg	2012-08-29 11:21:38 +02:00
gsm	put all dependencies in externals	2010-04-07 12:00:32 +02:00
libupnp	Add libupnp dependency for Android	2013-02-13 16:53:50 +01:00
libvpx	Update libvpx to v1.2.0.	2013-06-06 15:42:44 +02:00
libxml2	Merge remote-tracking branch 'public/master' into bellesip	2013-04-28 16:18:47 +02:00
libzrtpcpp	Add config.h of zrtpcpp (cmake no more required)	2011-10-13 09:27:57 +02:00
opencore-amr	Fix AMRNB light compilation and use updated msamr codec	2012-01-27 13:57:06 +01:00
polarssl	integrate polarssl to linphone-android.	2013-03-28 17:19:11 +01:00
speex	New speex repository	2011-11-16 10:53:44 +01:00
srtp	Fix android compilation issue with updated srtp	2012-04-27 17:57:15 +02:00
vo-amrwbenc	Fix AMR-WB integration (Android.mk)	2012-01-26 16:02:20 +01:00
webrtc	Add missing file.	2012-11-15 15:54:48 +01:00
x264	add msx264	2010-11-29 22:12:36 +01:00