Merge branch 'master' into 'master'

Update linphone

See merge request !421
This commit is contained in:
Boris Kraut 2014-12-27 03:13:13 +00:00
commit 2fbf694bab

View file

@ -72,7 +72,7 @@ Build:2.2.1.1,2211
buildjni=no
Build:2.3.2-fdroid,2302
commit=2fc5048
commit=0f4de68
submodules=yes
prebuild= find submodules/externals/antlr3/runtime/ -mindepth 1 -maxdepth 1 -not -name "C" -exec rm -r {} \; && \
rm -rf gradle liblinphone_tester tests && \