summaryrefslogtreecommitdiffstatshomepage
path: root/docs
diff options
context:
space:
mode:
author Stiletto <stilett0@users.noreply.github.com>2017-12-13 15:11:37 -0500
committer GitHub <noreply@github.com>2017-12-13 15:11:37 -0500
commitedb558b9161c020102c9e1da9fbf49eb2c5fcb8f (patch)
treeb607785f96502d3361805c7b783109b5f5fc2cde /docs
parent34ab1202e79a90f9d409e1aa9ec9f273056399f6 (diff)
(nw) more self-service
Diffstat (limited to 'docs')
-rw-r--r--docs/source/license.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/license.rst b/docs/source/license.rst
index 1ce48503983..5b7e0a137a7 100644
--- a/docs/source/license.rst
+++ b/docs/source/license.rst
@@ -4,7 +4,7 @@ The MAME License
The MAME project as a whole is distributed under the terms of the `GNU General Public License, version 2 or later <http://opensource.org/licenses/GPL-2.0>`_ (GPL-2.0+), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the `BSD-3-Clause License <http://opensource.org/licenses/BSD-3-Clause>`_ and we would encourage new contributors to distribute files under this license.
-Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo, or wordmark.
+Please note that MAME is a registered trademark of Gregory Ember, and permission is required to use the "MAME" name, logo, or wordmark.
Copyright (C) 1997-2017 MAMEDev and contributors