diff options
| author | isaacs <i@izs.me> | 2012-05-15 22:37:34 +0400 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-05-15 22:37:34 +0400 |
| commit | 5164ae38380dadce74e8f64d7bd3eaa1935dd101 (patch) | |
| tree | fa29fd7bcac679e69b1e9d7eff299aa38f9288a7 /Makefile | |
| parent | 01103d077bce626a332be998813382d15bed3501 (diff) | |
| parent | f19f980724fa07347a0d0a9d92e48b267555da5d (diff) | |
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
Conflicts:
ChangeLog
deps/uv/include/uv-private/uv-unix.h
deps/uv/src/unix/core.c
deps/uv/src/unix/sunos.c
deps/v8/src/runtime.cc
doc/api/crypto.markdown
lib/http.js
src/node_version.h
test/gc/test-http-client-timeout.js
wscript
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -154,7 +154,7 @@ out/doc/api/%.html: doc/api/%.markdown out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@ email.md: ChangeLog tools/email-footer.md - bash tools/changelog-head.sh > $@ + bash tools/changelog-head.sh | sed 's|^\* #|* \\#|g' > $@ cat tools/email-footer.md | sed -e 's|__VERSION__|'$(VERSION)'|g' >> $@ blog.html: email.md |