summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMole Shang <[email protected]>2024-02-10 13:46:25 +0800
committerMole Shang <[email protected]>2024-02-10 13:50:34 +0800
commit3673a2cdfb30e1e3936e695a3fb8adee74488d6b (patch)
tree282b4677f47bbb15949e24b3bfa455b173a38a29 /.gitignore
parentf379c1c4c80947365eb6c4046c3ab165629dc8cd (diff)
parentc9284cd93525436cc823258ab309c1b27eeec714 (diff)
downloadxv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.gz
xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.tar.bz2
xv6-labs-3673a2cdfb30e1e3936e695a3fb8adee74488d6b.zip
Merge branch 'pgtbl' into traps
Conflicts: .gitignore Makefile conf/lab.mk
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 29977c9..10a47b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ barrier
/lab-*.json
.DS_Store
*.dSYM
+riscv/
+compile_flags.txt