diff options
| author | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-12-13 16:57:58 -0800 |
| commit | 77ed12fe7a16d3d97d637512db109f4273711bec (patch) | |
| tree | d4b7237231ab810e8dc5906204e5d861efce2773 /AUTHORS | |
| parent | 6cf68aead6886d397772ea176a9f5c35fdb63071 (diff) | |
| parent | 45cdb0e4c12d8f8e9450174ddd6ddad52a995831 (diff) | |
| download | android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.tar.gz android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.tar.bz2 android-node-v8-77ed12fe7a16d3d97d637512db109f4273711bec.zip | |
Merge remote-tracking branch 'ry/v0.8' into master
Conflicts:
AUTHORS
ChangeLog
deps/uv/test/test-spawn.c
deps/uv/uv.gyp
src/cares_wrap.cc
src/node.cc
src/node_version.h
test/simple/test-buffer.js
tools/gyp/pylib/gyp/common.py
tools/install.py
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -378,3 +378,7 @@ Ricky Ng-Adam <rngadam@lophilo.com> Aaditya Bhatia <aadityabhatia@gmail.com> Max Ogden <max@maxogden.com> Igor Soarez <igorsoarez@gmail.com> +Olivier Lalonde <olalonde@gmail.com> +Francois Marier <francois@mozilla.com> +Trevor Norris <trev.norris@gmail.com> +Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp> |