diff options
| author | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
| commit | adf9b67e591fe1df9589412a75bad357a9410aa3 (patch) | |
| tree | 5d17c3a12c8d6d0edb67b596de4af90063ff1f2f /AUTHORS | |
| parent | b255f4c10a80343f9ce1cee56d0288361429e214 (diff) | |
| parent | 3fac4157fef1b083e199e04affbb6432f70861c2 (diff) | |
| download | nodejs-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.gz nodejs-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.bz2 nodejs-adf9b67e591fe1df9589412a75bad357a9410aa3.zip | |
Merge remote-tracking branch 'ry/v0.10' into master
Conflicts:
ChangeLog
deps/uv/ChangeLog
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/v8/build/common.gypi
deps/v8/src/frames.h
deps/v8/src/runtime.cc
deps/v8/test/mjsunit/debug-set-variable-value.js
lib/http.js
src/node_version.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -459,3 +459,5 @@ Nathan Zadoks <nathan@nathan7.eu> Rafael Henrique Moreira <rafadev7@gmail.com> Daniel G. Taylor <dan@programmer-art.org> Kiyoshi Nomo <tokyoincidents.g@gmail.com> +Veres Lajos <vlajos@gmail.com> +Yuan Chuan <yuanchuan23@gmail.com> |