diff options
| author | isaacs <i@izs.me> | 2012-05-15 11:37:34 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-05-15 11:37:34 -0700 |
| commit | 5164ae38380dadce74e8f64d7bd3eaa1935dd101 (patch) | |
| tree | fa29fd7bcac679e69b1e9d7eff299aa38f9288a7 /test/fixtures | |
| parent | 01103d077bce626a332be998813382d15bed3501 (diff) | |
| parent | f19f980724fa07347a0d0a9d92e48b267555da5d (diff) | |
| download | node-5164ae38380dadce74e8f64d7bd3eaa1935dd101.tar.gz | |
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 'test/fixtures')
| -rw-r--r-- | test/fixtures/test_cert.pfx | bin | 0 -> 1970 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/test/fixtures/test_cert.pfx b/test/fixtures/test_cert.pfx Binary files differnew file mode 100644 index 000000000..fd28781a0 --- /dev/null +++ b/test/fixtures/test_cert.pfx |