diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2014-12-05 19:18:36 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2014-12-05 19:18:36 +0100 |
| commit | a6f2a4f834f1574865d93636d8cc826aaa939806 (patch) | |
| tree | 6c8a176045f4292158cbbb19c9146950d7116bb9 /docs/src | |
| parent | dfdcfc0c4dc0a1bf8c49aba7e53b5ec590d1c71d (diff) | |
| parent | 9da5fd443ebc2c56a7f5946f0a1e04801b370a33 (diff) | |
| download | libuv-a6f2a4f834f1574865d93636d8cc826aaa939806.tar.gz libuv-a6f2a4f834f1574865d93636d8cc826aaa939806.zip | |
Merge branch 'v0.10' into v1.x
Conflicts:
AUTHORS
ChangeLog
README.md
config-unix.mk
include/uv.h
src/unix/internal.h
src/unix/kqueue.c
src/unix/linux-core.c
src/unix/stream.c
src/uv-common.c
src/uv-common.h
src/version.c
test/test-osx-select.c
Diffstat (limited to 'docs/src')
0 files changed, 0 insertions, 0 deletions