Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into light_version
Browse files Browse the repository at this point in the history
Note: No MXE buildable
  • Loading branch information
OlexiyKhokhlov committed Mar 4, 2017
2 parents a9e48f3 + 9a8a965 commit 2f1f76a
Show file tree
Hide file tree
Showing 1,973 changed files with 146,484 additions and 158,836 deletions.
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@

/build/*
/build/Debug
/build/debug
/build/Release
/build/release
/build/gyp

/base
/buildtools
/out
/testing/corpus
Expand All @@ -14,6 +8,7 @@
/third_party/android_ndk
/third_party/catapult
/third_party/icu
/third_party/instrumented_libraries
/third_party/llvm
/third_party/llvm-build
/third_party/skia
Expand Down
9 changes: 9 additions & 0 deletions .gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,12 @@

buildconfig = "//build/config/BUILDCONFIG.gn"
secondary_source = "//build/secondary/"

default_args = {
v8_extra_library_files = []
v8_experimental_extra_library_files = []
v8_enable_inspector = false

# Turns on compiler optimizations in V8 in Debug build.
v8_optimized_debug = true
}
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
# See python fnmatch module documentation for more information.

Andrey Khalyavin <halyavin@chromium.org>
Antonio Gomes <tonikitoo@igalia.com>
Brett Wilson <brettw@chromium.org>
Bruce Dawson <brucedawson@chromium.org>
Chery Cherian <cherycherian@gmail.com>
Chris Palmer <palmer@chromium.org>
Dan Sinclair <dsinclair@chromium.org>
Finnur Thorarinsson <finnur@chromium.org>
GiWan Go <gogil@stealien.com>
Jiang Jiang <jiangj@opera.com>
Jochen Eisinger <jochen@chromium.org>
John Abd-El-Malek <jam@chromium.org>
Expand All @@ -25,6 +27,7 @@ Lei Zhang <thestig@chromium.org>
Lucas Nihlen <luken@chromium.org>
Matt Giuca <mgiuca@chromium.org>
Michael Doppler <m.doppler@gmail.com>
Miklos Vajna <vmiklos@vmiklos.hu>
Nico Weber <thakis@chromium.org>
Peter Kasting <pkasting@chromium.org>
Raymes Khoury <raymes@chromium.org>
Expand Down
Loading

0 comments on commit 2f1f76a

Please sign in to comment.