From eb14cf71575463fc889e533bd1741a79749d8926 Mon Sep 17 00:00:00 2001 From: Ricky Date: Wed, 23 Apr 2014 12:33:11 +1000 Subject: [PATCH] updated readme --- LICENSE | 28 ++++++++++------------------ README.md | 2 +- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/LICENSE b/LICENSE index 315b237c..896c78c4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,13 @@ -The MIT License (MIT) +Copyright 2014 DiUS Computing -Copyright (c) 2011 - 2014, DiUS Computing Pty Ltd +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -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: +http://www.apache.org/licenses/LICENSE-2.0 -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. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index ba87a8f2..c70a3d6f 100644 --- a/README.md +++ b/README.md @@ -38,4 +38,4 @@ How to build LICENSE ------- -Copyright (c) 2011-2014 DiUS Computing Pty Ltd. See the LICENSE file for license rights and limitations (MIT). +Copyright (c) 2014 DiUS Computing Pty Ltd. See the LICENSE file for license rights and limitations.