diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-03 19:57:04 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-06 03:12:05 -0700 |
| commit | 518430db3a8e2e5374136a0ec9754b6d5a7e8ee6 (patch) | |
| tree | 888015b7b58225b1375895c901601372fe641b61 /deps/http_parser | |
| parent | 81a999c954b09803f74ac3959ab78ea14172c0a4 (diff) | |
| download | android-node-v8-518430db3a8e2e5374136a0ec9754b6d5a7e8ee6.tar.gz android-node-v8-518430db3a8e2e5374136a0ec9754b6d5a7e8ee6.tar.bz2 android-node-v8-518430db3a8e2e5374136a0ec9754b6d5a7e8ee6.zip | |
WIP
Diffstat (limited to 'deps/http_parser')
| -rw-r--r-- | deps/http_parser/http_parser.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/deps/http_parser/http_parser.gyp b/deps/http_parser/http_parser.gyp index e9183b8d55..3c0fd24d0b 100644 --- a/deps/http_parser/http_parser.gyp +++ b/deps/http_parser/http_parser.gyp @@ -26,6 +26,7 @@ }, 'defines': [ 'HTTP_PARSER_STRICT=0' ], 'sources': [ './http_parser.c', ], +<<<<<<< HEAD 'conditions': [ ['OS=="win"', { 'msvs_settings': { @@ -37,6 +38,8 @@ }, }] ], +======= +>>>>>>> WIP }, { |