GitBucket
|
Merge branch 'master' of
http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git Conflicts: sys/include/sys/sysproto.h sys/kernel/time.c |
|---|
|
|
| lib/csu/amd64/Scrt1.s 100644 → 0 |
|---|
| lib/csu/amd64/crt1.s 100644 → 0 |
|---|
| lib/csu/amd64/gcrt1.s 100644 → 0 |
|---|
| sys/include/sys/sysproto.h |
|---|
| sys/kernel/gen_calls.c |
|---|
| sys/kernel/syscalls_posix.c |
|---|
| sys/kernel/time.c |
|---|
| sys/net/net/sys_arch.c |
|---|