summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/whatis.rst
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 20:52:42 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 20:52:42 -0700
commitf537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (patch)
tree7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /docs/source/whatis.rst
parent0d70d798107d4e4e8fb9f230410aeb1e888d65c5 (diff)
parent6379bf581489df72694b1c42cc7436ca0f1d89b2 (diff)
Merge branch 'master' of https://github.com/mamedev/mame
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**
|