Merge branch 'master' into nightly
commit9cbfbf5b51a523f6c5beb806673bcdc5fb9fa2f5
authorJens Petersen <juhpetersen@gmail.com>
dateFri 31 Mar 2017, 18:27 (10 years ago)
parent82656b80348d44
debian-bootstrap.sh+2−2
@@ -184,6 +184,6 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
184184 && apt-get install -y llvm-4.0
185185
186186# non-free repo
187−apt-add-repository multiverse
188− && apt-get update
187+apt-add-repository multiverse \
188+ && apt-get update \
189189 && apt-get install -y libfdk-aac-dev