Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-09-29 11:19:18 +02:00
commit 936095b9a5

View File

@ -22,6 +22,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-api-key ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release ac_add_options --enable-release
ac_add_options --enable-pie ac_add_options --enable-pie
ac_add_options --disable-stylo
export BUILD_OFFICIAL=1 export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1 export MOZILLA_OFFICIAL=1