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-03' into post-04

Browse Source
This commit is contained in:
Philipp Oppermann
2019-12-12 09:23:30 +01:00
parent adcb547765 abd2f4c5e2
commit 56cf71df9f
3 changed files with 224 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
README.md
View File

@@ -57,4 +57,17 @@ Where `sdX` is the device name of your USB stick. **Be careful** to choose the c
To run the unit and integration tests, execute `cargo xtest`.
## License
The source code is dual-licensed under MIT or the Apache License (Version 2.0).
Licensed under either of
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
http://www.apache.org/licenses/LICENSE-2.0)
- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
at your option.
Note that this only applies to this git branch, other branches might be licensed differently.
### Contribution
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.