From 54155441e9ba9941e85d80c4834a66376a11e791 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:01:10 -0700 Subject: Revert "Merge branch 'master' of https://github.com/mamedev/mame" This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5. --- docs/source/whatis.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/source/whatis.rst') 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** | -- cgit v1.2.3-70-g09d2