diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2012-01-09 23:20:22 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2012-01-09 23:20:22 +0400 |
commit | 8b28d599a72e717dc00d10f2cc68e64ac6fd5330 (patch) | |
tree | 2932f7ead998ede43835a00f4b7cf5920e4d4816 /node.gyp | |
parent | 08a91acd76cd107dc2f3914f9ea7e277bb85206e (diff) | |
parent | cc5cea35b0e25352ff40780532d4c5a6bba00359 (diff) |
Merge remote branch 'origin/v0.6'
Conflicts:
Makefile
configure
src/node_version.h
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ { 'variables': { - 'v8_use_snapshot': 'true', + 'v8_use_snapshot%': 'true', # Turn off -Werror in V8 # See http://codereview.chromium.org/8159015 'werror': '', |