Merge latest green inbound changeset and mozilla-central

This commit is contained in:
Ed Morley 2014-01-15 15:54:08 +00:00
commit 5cc09def28
3 changed files with 6 additions and 2 deletions

View File

@ -2,8 +2,6 @@ ac_add_options --enable-debug
ac_add_options --enable-trace-malloc ac_add_options --enable-trace-malloc
ac_add_options --enable-signmar ac_add_options --enable-signmar
ac_add_options --disable-unified-compilation
. $topsrcdir/build/unix/mozconfig.linux . $topsrcdir/build/unix/mozconfig.linux
# Needed to enable breakpad in application.ini # Needed to enable breakpad in application.ini

View File

@ -0,0 +1,3 @@
. "$topsrcdir/browser/config/mozconfigs/linux64/debug"
ac_add_options --disable-unified-compilation

View File

@ -0,0 +1,3 @@
. "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
ac_add_options --disable-unified-compilation