Merge branch 'develop' of github.com:wichtounet/thor-os into develop

This commit is contained in:
Baptiste Wicht 2014-02-09 23:02:55 +01:00
commit c2f5a8ef57

View File

@ -5,6 +5,10 @@ Thor is a minimalistic operating system created for learning reasons.
It is currently a 64bit OS written in assembly and C++.
## Build ##
Build procedure is described on the Wiki: https://github.com/wichtounet/thor-os/wiki/Build
## License ##
This project is distributed under the Boost Software License 1.0. Read `LICENSE_1_0.txt` for details.
This project is distributed under the Boost Software License 1.0. Read `LICENSE` for details.