Merge branch 'dev'

master
Jiajie Chen 6 years ago
commit fad837c916

4
kernel/Cargo.lock generated

@ -328,12 +328,12 @@ dependencies = [
[[package]]
name = "rcore-fs"
version = "0.1.0"
source = "git+https://github.com/rcore-os/rcore-fs#f8d7b06727b0a66091419b2dd6a15f620a7152af"
source = "git+https://github.com/rcore-os/rcore-fs#c611248f800e946acf44d64b218aeb8fc6751640"
[[package]]
name = "rcore-fs-sfs"
version = "0.1.0"
source = "git+https://github.com/rcore-os/rcore-fs#f8d7b06727b0a66091419b2dd6a15f620a7152af"
source = "git+https://github.com/rcore-os/rcore-fs#c611248f800e946acf44d64b218aeb8fc6751640"
dependencies = [
"bitvec 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",

@ -1 +1 @@
Subproject commit 69febc9fcc64df60329687b4f24b9b5309c99adf
Subproject commit 8af72001d15af969c2e7c4feec43d8f9efe9331e
Loading…
Cancel
Save