summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/whatis.rst
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:31:27 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:31:27 -0700
commit9ece34eb218c5c1960468294c733fd00ac7fa696 (patch)
tree7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /docs/source/whatis.rst
parent54155441e9ba9941e85d80c4834a66376a11e791 (diff)
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'docs/source/whatis.rst')
-rw-r--r--docs/source/whatis.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst
index a057398c2ad..5c612960901 100644
--- a/docs/source/whatis.rst
+++ b/docs/source/whatis.rst
@@ -8,7 +8,7 @@ MAME's purpose is to preserve decades of software history. As electronic technol
|
| **MAME(R)**
| **Copyright (c) 1997-2017 by Nicola Salmoria and the MAME team**
-| **MAME is a trademark owned by Nicola Salmoria**
+| **MAME is a trademark owned by Gregory Ember**
|