Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-03-31 18:27:27 +09:00
commit 9cbfbf5b51

View File

@ -184,6 +184,6 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& apt-get install -y llvm-4.0
# non-free repo
apt-add-repository multiverse
&& apt-get update
apt-add-repository multiverse \
&& apt-get update \
&& apt-get install -y libfdk-aac-dev