From 9a5a81e031fbe547b6f53d54d6e4bbf4e3646926 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Mon, 22 Dec 2014 03:49:52 +0100 Subject: [PATCH] Updated the README file. --- README.html | 53 ++++++++++++++++++++++---------- src/3rd_party/keccak/LICENSE.txt | 36 ++++++++-------------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/README.html b/README.html index db5da66..e113568 100644 --- a/README.html +++ b/README.html @@ -4,28 +4,47 @@ MUtilites +

MUtilities – MuldeR's Utilities for Qt

-

Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>

Please visit http://muldersoft.com/ or https://github.com/lordmulder for more information!

-

- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -

-

https://www.gnu.org/licenses/lgpl-2.1.html

+

About this Library

+

This library is a collection of routines and classes to extend the Qt cross-platform framework. It contains various convenience and utility functions as well as wrappers for OS-specific functionalities. The library was originally created as a "side product" of the LameXP application: Over the years, a lot of code, not really specific to LameXP, had accumulated in the LameXP code base. Some of that code even had been used in other projects too, in a "copy & paste" fashion – which had lead to redundancy and much complicated maintenance. In order to clean-up the LameXP code base, to eliminate the ugly redundancy and to simplify maintenance, the code in question has finally been refactored into the MUtilities (aka "MuldeR's Utilities for Qt") library. This library now forms the foundation of LameXP and various other OpenSource projects. +

+

License Information

+

This library is free software. It is released under the terms of the GNU Lesser General Public License (LGPL), Version 2.1.

+ 

MUtilities – MuldeR's Utilities for Qt
Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>. Some rights reserved.

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library 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
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
+
+

Acknowledgement

+

The following third-party code is used in the MUtilities library: +

e.o.f.

diff --git a/src/3rd_party/keccak/LICENSE.txt b/src/3rd_party/keccak/LICENSE.txt index f2b6226..729de00 100644 --- a/src/3rd_party/keccak/LICENSE.txt +++ b/src/3rd_party/keccak/LICENSE.txt @@ -1,27 +1,15 @@ -/* - --------------------------------------------------------------------------- - Copyright (c) 1998-2008, Brian Gladman, Worcester, UK. All rights reserved. +Keccak hash algorithm as provided by the inventors, and submitted to the +third round of the NIST SHA-3 competition. - LICENSE TERMS +Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni, +Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby +denoted as "the implementer". - The redistribution and use of this software (with or without changes) - is allowed without the payment of fees or royalties provided that: +For more information, feedback or questions, please refer to our websites: +http://keccak.noekeon.org/ +http://keyak.noekeon.org/ +http://ketje.noekeon.org/ - 1. source code distributions include the above copyright notice, this - list of conditions and the following disclaimer; - - 2. binary distributions include the above copyright notice, this list - of conditions and the following disclaimer in their documentation; - - 3. the name of the copyright holder is not used to endorse products - built using this software without specific written permission. - - DISCLAIMER - - This software is provided 'as is' with no explicit or implied warranties - in respect of its properties, including, but not limited to, correctness - and/or fitness for purpose. - --------------------------------------------------------------------------- - Issue Date: 20/12/2007 - Changes for ARM 9/9/2010 -*/ +To the extent possible under law, the implementer has waived all copyright +and related or neighboring rights to the source code in this file. +http://creativecommons.org/publicdomain/zero/1.0/