diff options
| author | Mole Shang <135e2@135e2.dev> | 2024-02-11 14:44:22 +0800 |
|---|---|---|
| committer | Mole Shang <135e2@135e2.dev> | 2024-02-11 16:06:15 +0800 |
| commit | 2fe04bc8faa4bf737a86c36a8017473e84814f3b (patch) | |
| tree | 2146d3dae86f21060e2e807ad364f5a949fd1c53 /conf/lab.mk | |
| parent | 5ce1f630132d8b7b35b9dc46b4a55f860eb85d5c (diff) | |
| parent | 48a5e34fcd07852b4a68825ce8e37feb6f6d04d7 (diff) | |
| download | xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.gz xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.tar.bz2 xv6-labs-2fe04bc8faa4bf737a86c36a8017473e84814f3b.zip | |
Merge branch 'traps' into cow
Conflicts:
.gitignore
Makefile
conf/lab.mk
Diffstat (limited to 'conf/lab.mk')
0 files changed, 0 insertions, 0 deletions