diff options
| author | Mole Shang <[email protected]> | 2024-02-17 11:55:33 +0800 |
|---|---|---|
| committer | Mole Shang <[email protected]> | 2024-02-17 12:22:07 +0800 |
| commit | e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd (patch) | |
| tree | fb42ba5be7a8ae608b968266f62fd71fa889a89d /.gitignore | |
| parent | a6af72924b115c1177d18d9b1eaba56623e4248b (diff) | |
| parent | d85aec2689c4250d0384904bdc11aa618c726bec (diff) | |
| download | xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.gz xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.tar.bz2 xv6-labs-e8e0a7b4c97064eb5e9415726d7e38aaceccd3fd.zip | |
Merge branch 'thread' into fs
Conflicts:
.gitignore
Makefile
conf/lab.mk
kernel/param.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 |