diff options
| author | Bert Belder <bertbelder@gmail.com> | 2014-12-10 16:58:01 +0100 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2014-12-10 16:58:01 +0100 |
| commit | 9f3fa71cfa99adbd70755b1c5d46d4473b824b99 (patch) | |
| tree | 77945062defd656f3a66509ab43a15a478e3188c /docs/src | |
| parent | 2f0b41ec82d360ab0f47c6194403389af25ad48a (diff) | |
| parent | 48d39345bc0f19e6ba39f40950018e1edd0cccb2 (diff) | |
| download | libuv-9f3fa71cfa99adbd70755b1c5d46d4473b824b99.tar.gz libuv-9f3fa71cfa99adbd70755b1c5d46d4473b824b99.zip | |
Merge branch 'v0.10' into v1.x
Conflicts:
src/win/poll.c
test/test-poll-close-doesnt-corrupt-stack.c
Diffstat (limited to 'docs/src')
0 files changed, 0 insertions, 0 deletions