From fb3075260000b1bbc4802855a137a74935f9aaca Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Fri, 9 May 2014 09:27:28 +0100 Subject: [PATCH] Updated license info to account for RequireJS. --- docs/LOOT Readme.html | 2 +- docs/licenses/Licenses.txt | 2 +- docs/licenses/MIT License (PugiXML).txt | 22 --------- docs/licenses/MIT License (RequireJS).txt | 58 +++++++++++++++++++++++ 4 files changed, 60 insertions(+), 24 deletions(-) delete mode 100644 docs/licenses/MIT License (PugiXML).txt create mode 100644 docs/licenses/MIT License (RequireJS).txt diff --git a/docs/LOOT Readme.html b/docs/LOOT Readme.html index 192e152a..dc79e432 100644 --- a/docs/LOOT Readme.html +++ b/docs/LOOT Readme.html @@ -369,7 +369,7 @@ To translate the LOOT application:
  • Brazilian Portuguese translation: Kassane
  • Beta testing: Too many to list, thank you all! -

    LOOT is written in C++ and makes use of the Alphanum, Boost, libespm, libgit2, libloadorder, PugiXML, wxWidgets and yaml-cpp libraries. LOOT's reports are written in HTML5/CSS3/Javascript and make use of Polyfill.js to provide Internet Explorer 8 compatibility. Copyright license information for all these may be found here. +

    LOOT is written in C++ and makes use of the Alphanum, Boost, libespm, libgit2, libloadorder, wxWidgets and yaml-cpp libraries. LOOT's reports are written in HTML5/CSS3/Javascript and make use of Polyfill.js and RequireJS. Copyright license information for all these may be found here.

    License

    LOOT is distributed under the GNU General Public License v3.0, aside from the documentation, which is distributed under the GNU Free Documentation License v1.3. The full texts of the licenses are included with LOOT in the accompanying GNU GPL v3.txt and GNU FDL v1.3.txt files. diff --git a/docs/licenses/Licenses.txt b/docs/licenses/Licenses.txt index 02149363..07dd0031 100644 --- a/docs/licenses/Licenses.txt +++ b/docs/licenses/Licenses.txt @@ -8,7 +8,7 @@ LOOT uses a number of libraries, and their licenses are listed in this file. * Libgit2 - GNU GPL v2; see "GNU GPL v2 (libgit2).txt" for the text. * Libloadorder - GNU GPL v3; see "GNU GPL v3.txt" for the text. * Polyfill.js - This code has been placed in the public domain. -* PugiXML - MIT License; see "MIT License (PugiXML).txt" for the text. +* RequireJS - MIT License; see "MIT License (RequireJS).txt" for the text. * wxWidgets - wxWindows License; the text is not included as allowed by the license. * yaml-cpp - MIT License; see "MIT License (yaml-cpp).txt" for the text. * zlib - zlib license; the text is not included as allowed by the license. diff --git a/docs/licenses/MIT License (PugiXML).txt b/docs/licenses/MIT License (PugiXML).txt deleted file mode 100644 index 03459ba5..00000000 --- a/docs/licenses/MIT License (PugiXML).txt +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2006-2012 Arseny Kapoulkine - -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: - -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. diff --git a/docs/licenses/MIT License (RequireJS).txt b/docs/licenses/MIT License (RequireJS).txt new file mode 100644 index 00000000..668ac916 --- /dev/null +++ b/docs/licenses/MIT License (RequireJS).txt @@ -0,0 +1,58 @@ +RequireJS is released under two licenses: new BSD, and MIT. You may pick the +license that best suits your development needs. The text of both licenses are +provided below. + + +The "New" BSD License: +---------------------- + +Copyright (c) 2010-2014, The Dojo Foundation +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the Dojo Foundation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +MIT License +----------- + +Copyright (c) 2010-2013, The Dojo Foundation + +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: + +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.