michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-04' into post-05

Browse Source
This commit is contained in:
Philipp Oppermann
2020-03-08 14:39:37 +01:00
parent 813bc41a74 d7e505da9e
commit e402af005b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -63,9 +63,9 @@ checksum = "6af0edf5b4faacc31fc51159244d78d65ec580f021afcef7bd53c04aeabc7f29"
[[package]] [[package]]
name = "x86_64" name = "x86_64"
version = "0.9.5" version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e6a3f047ad0844d3b4794f34d1095aefb918241064663d4163db8c7d4a76edf" checksum = "4206b60c9f99766329b66962aa8ddc01df6c7edd02edc046b7a69d5df9fcdbcf"
dependencies = [ dependencies = [
"bit_field", "bit_field",
"bitflags", "bitflags",

2
Cargo.toml
View File

@@ -12,7 +12,7 @@ harness = false
bootloader = "0.8.0" bootloader = "0.8.0"
volatile = "0.2.6" volatile = "0.2.6"
spin = "0.5.2" spin = "0.5.2"
x86_64 = "0.9.5" x86_64 = "0.9.6"
uart_16550 = "0.2.0" uart_16550 = "0.2.0"
[dependencies.lazy_static] [dependencies.lazy_static]