diff --git a/LICENSE b/LICENSE deleted file mode 100644 index aa1d60a7..00000000 --- a/LICENSE +++ /dev/null @@ -1,35 +0,0 @@ -The ToAruOS kernel is released under the terms of the -University of Illinois / NCSA License. - -Copyright (c) 2011-2014 Kevin Lange. All rights reserved. - - Dedicated to the memory of - Dennis Ritchie - 1941-2011 - -Developed by: ToAruOS Kernel Development Team - http://toaruos.org - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal with 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: - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimers. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimers in the - documentation and/or other materials provided with the distribution. - 3. Neither the names of the ToAruOS Kernel Development Team, Kevin Lange, - nor the names of its contributors may be used to endorse - or promote products derived from this Software without specific prior - written permission. - -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 -CONTRIBUTORS 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 -WITH THE SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md index 4c04373d..b683f090 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,6 +4,13 @@ This project is released under the terms of the University of Illinois / NCSA Op Copyright (c) 2011-2014 Kevin Lange. All rights reserved. + Dedicated to the memory of + Dennis Ritchie + 1941-2011 + + Developed by: ToAruOS Kernel Development Team + http://toaruos.org + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the