Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
Zhi Guan
2017-02-14 16:12:29 +08:00
parent d2254170b8
commit 43fed1108d
3503 changed files with 320546 additions and 408546 deletions

2
os-dep/haiku.h Normal file
View File

@@ -0,0 +1,2 @@
#include <sys/select.h>
#include <sys/time.h>