summaryrefslogtreecommitdiffstatshomepage
path: root/docs
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-05-25 14:33:33 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-05-25 14:33:52 +0200
commit24461e1355168de22b6148194a98b6a074805157 (patch)
tree2384eddb460f1c2c412ad0ee35071a8284bac969 /docs
parent4e47a1062dc6a4b418959df8f637754abf5ff356 (diff)
Update license information on github (nw)
Diffstat (limited to 'docs')
-rw-r--r--docs/license.txt35
-rw-r--r--docs/licenseinfo.txt4
2 files changed, 0 insertions, 39 deletions
diff --git a/docs/license.txt b/docs/license.txt
deleted file mode 100644
index 33267a54cb1..00000000000
--- a/docs/license.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Unless otherwise explicitly stated, all code in MAME is released under the
-following license:
-
-Copyright Nicola Salmoria and the MAME team
-All rights reserved.
-
-Redistribution and use of this code or any derivative works are permitted
-provided that the following conditions are met:
-
-* Redistributions may not be sold, nor may they be used in a commercial
-product or activity.
-
-* Redistributions that are modified from the original source must include the
-complete source code, including the source code for all components used by a
-binary built from the modified sources. However, as a special exception, the
-source code distributed need not include anything that is normally distributed
-(in either source or binary form) with the major components (compiler, kernel,
-and so on) of the operating system on which the executable runs, unless that
-component itself accompanies the executable.
-
-* Redistributions 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.
-
-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.
diff --git a/docs/licenseinfo.txt b/docs/licenseinfo.txt
deleted file mode 100644
index 91ae09434f6..00000000000
--- a/docs/licenseinfo.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-BSD-3-Clause: http://spdx.org/licenses/BSD-3-Clause
-GPL-2.0+: http://spdx.org/licenses/GPL-2.0+
-LGPL-2.1+: http://spdx.org/licenses/LGPL-2.1+
-MAME: see docs/license.txt