diff options
| author | Mole Shang <[email protected]> | 2024-02-14 20:46:23 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-14 20:46:23 +0800 |
| commit | f98eeb30507040dc916b2a337818830954ee1d4a (patch) | |
| tree | a741cb0bbd6be96d8084e72b4af895ac093a2b48 /.gitignore | |
| parent | 0de5ac779602f562a038e5ad27163d85bc71638b (diff) | |
| parent | 904885a96efd1dd0221585f67477f5a39bcce7f7 (diff) | |
| download | xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.tar.gz xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.tar.bz2 xv6-labs-f98eeb30507040dc916b2a337818830954ee1d4a.zip | |
Merge branch 'net' into lock
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/defs.h
user/user.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -25,3 +25,5 @@ barrier .DS_Store *.dSYM *.pcap +riscv/ +compile_flags.txt |