diff options
author | Fedor Indutny <fedor.indutny@gmail.com> | 2012-01-12 00:17:44 +0400 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2012-01-12 00:17:44 +0400 |
commit | 9e6957b0a55e7ef8cd2a2efc066555da8d781355 (patch) | |
tree | 4e9835aca02883f3303623dd6c80cb55231cdc3e /Makefile | |
parent | 8abb73ef58ccb6fd1b8cc4266c9981ce6574c78f (diff) | |
parent | 07701e7cc85feaeaa0a2a6c8146b0cb3eefc12fe (diff) |
Merge branch 'v0.6'
Conflicts:
src/handle_wrap.cc
src/node_zlib.cc
src/process_wrap.cc
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -177,7 +177,7 @@ bench-idle: ./node benchmark/idle_clients.js & jslint: - PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/ + PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ -r test/ --exclude_files lib/punycode.js cpplint: @$(PYTHON) tools/cpplint.py $(wildcard src/*.cc src/*.h src/*.c) |