From 543f202412d957ec4c27d33ca8f1c8fe2805304a Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Tue, 29 Dec 2015 12:21:29 +0100 Subject: [PATCH] Dual license code under apache2/mit --- LICENSE => LICENSE-APACHE | 0 LICENSE-MIT | 9 +++++++++ README.md | 3 +++ 3 files changed, 12 insertions(+) rename LICENSE => LICENSE-APACHE (100%) create mode 100644 LICENSE-MIT diff --git a/LICENSE b/LICENSE-APACHE similarity index 100% rename from LICENSE rename to LICENSE-APACHE diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 00000000..2286d30b --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (c) 2015 Philipp Oppermann + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index c433594e..b22dd09b 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,6 @@ [![Build Status](https://travis-ci.org/phil-opp/blog_os.svg?branch=master)](https://travis-ci.org/phil-opp/blog_os) This repository contains the code for the “Writing an OS in Rust” series at [os.phil-opp.com](http://os.phil-opp.com). + +# License +The source code is dual-licensed under MIT or the Apache License (Version 2.0). This excludes the `posts` and `pages` directories.