diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-26 13:16:16 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-26 13:16:16 -0700 |
| commit | f1996ffebc79148b94dab4cb6e7eceecf6e17554 (patch) | |
| tree | 0622d69526290198e985793ebf6e8784c2a56862 /AUTHORS | |
| parent | 028908ab7cc576d3013960a4580fcd9bf21cc26e (diff) | |
| parent | 0c91a835ff7d5fd1ee288d11d977a95122aa400e (diff) | |
| download | nodejs-f1996ffebc79148b94dab4cb6e7eceecf6e17554.tar.gz nodejs-f1996ffebc79148b94dab4cb6e7eceecf6e17554.tar.bz2 nodejs-f1996ffebc79148b94dab4cb6e7eceecf6e17554.zip | |
Merge remote branch 'origin/v0.4'
Conflicts:
AUTHORS
ChangeLog
doc/api/stdio.markdown
doc/index.html
doc/template.html
lib/net.js
src/node_version.h
test/simple/test-child-process-customfd-bounded.js
test/simple/test-console-not-call-toString.js
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -197,3 +197,8 @@ Igor Zinkovsky <igorzi@microsoft.com> Shigeki Ohtsu <ohtsu@d.jp> vegorov@chromium.org <vegorov@chromium.org> Pierre-Alexandre St-Jean <pierrealexandre.stjean@gmail.com> +Vicente Jimenez Aguilar <googuy@gmail.com> +SAWADA Tadashi <cesare@mayverse.jp> +Logan Smyth <loganfsmyth@gmail.com> +Christopher Wright <christopherwright@gmail.com> +Mickaël Delahaye <mickael.delahaye@gmail.com> |