From 9ece34eb218c5c1960468294c733fd00ac7fa696 Mon Sep 17 00:00:00 2001 From: Firehawke Date: Wed, 13 Dec 2017 21:31:27 -0700 Subject: Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791. --- 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 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** | -- cgit v1.2.3-70-g09d2