summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/whatis.rst
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
commit54155441e9ba9941e85d80c4834a66376a11e791 (patch)
treeaa44bdaf0035cbe188d64c447f225f10f7d76d8d /docs/source/whatis.rst
parentf537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff)
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
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 5c612960901..a057398c2ad 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 Gregory Ember**
+| **MAME is a trademark owned by Nicola Salmoria**
|