diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 16:12:26 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-12 16:12:26 +0100 |
| commit | 8a6576f764f73e4f74c277aa5f9bb4490ea07cf1 (patch) | |
| tree | 3e372835ec5b25b56b1bccd27ae74932dd0854cd /node.gyp | |
| parent | a27320e00f12d26dad1b464bf89484faf429a688 (diff) | |
| parent | 2f759a7090a15824a261e168221caa5109c86d44 (diff) | |
| download | android-node-v8-8a6576f764f73e4f74c277aa5f9bb4490ea07cf1.tar.gz android-node-v8-8a6576f764f73e4f74c277aa5f9bb4490ea07cf1.tar.bz2 android-node-v8-8a6576f764f73e4f74c277aa5f9bb4490ea07cf1.zip | |
Merge remote-tracking branch 'origin/v0.6'
Conflicts:
common.gypi
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -4,7 +4,6 @@ # Turn off -Werror in V8 # See http://codereview.chromium.org/8159015 'werror': '', - 'target_arch': 'ia32', 'node_use_dtrace': 'false', 'node_use_openssl%': 'true', 'node_use_system_openssl%': 'false', |