From b05251cb39d42dcaa610136136d8e68c42d37808 Mon Sep 17 00:00:00 2001 From: Jon Stroop Date: Mon, 6 Oct 2014 10:12:26 -0400 Subject: [PATCH] Update README.md README had old license! --- README.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1616ad6d..f09040be 100644 --- a/README.md +++ b/README.md @@ -59,21 +59,23 @@ See http://iiif.io/api/image/2.0/compliance.html for details. License ------- -### Loris -Copyright (C) 2013-4 Jon Stroop +Copyright 2013-14 Jon Stroop -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. +Additional copyright may be held by others, as reflected in the commit log. +Kakadu and OpenJPEG are included under the terms of their own respecitve +licenses (see LICENSE-Kakadu.txt and LICENSE-OpenJPEG.txt). -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. +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 -You should have received a copy of the GNU General Public License along -with this program. If not, see . + http://www.apache.org/licenses/LICENSE-2.0 + +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. ### Kakadu #### Downloadable Executables Copyright and Disclaimer