From fadfd000e970e49cde3b8229e3318e074fb49862 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 15 Aug 2010 22:07:29 +0000 Subject: [PATCH] fix up copying here too. other license info has always been there - just not shuffled into standard copying. fix. SVN revision: 51143 --- legacy/embryo/COPYING | 23 +++++++++++++++++++++++ legacy/embryo/src/lib/embryo_amx.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/legacy/embryo/COPYING b/legacy/embryo/COPYING index 9690c3f6f6..1b3cb9f545 100644 --- a/legacy/embryo/COPYING +++ b/legacy/embryo/COPYING @@ -1,3 +1,4 @@ +Copyright (C) 2004-2010 Carsten Haitzler and various contributors (see AUTHORS) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to @@ -30,3 +31,25 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS 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. + +Large parts of this source come under the following license (less +restrictive than the above). See the source files that are clearly marked +as below: + +Copyright (c) ITB CompuPhase, 1997-2003 + +This software is provided "as-is", without any express or implied warranty. +In no event will the authors be held liable for any damages arising from +the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software in + a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. diff --git a/legacy/embryo/src/lib/embryo_amx.c b/legacy/embryo/src/lib/embryo_amx.c index 9b21da0be2..26911895eb 100644 --- a/legacy/embryo/src/lib/embryo_amx.c +++ b/legacy/embryo/src/lib/embryo_amx.c @@ -1,7 +1,7 @@ /* Abstract Machine for the Small compiler * * Copyright (c) ITB CompuPhase, 1997-2003 - * Portions Copyright (c) Carsten Haitzler, 2004 + * Portions Copyright (c) Carsten Haitzler, 2004-2010 * * This software is provided "as-is", without any express or implied warranty. * In no event will the authors be held liable for any damages arising from