diff options
author | 2017-01-26 19:55:37 +0100 | |
---|---|---|
committer | 2017-01-26 19:55:37 +0100 | |
commit | f603c763fe35a81bd3a7f41ab8a53c61c953e2cb (patch) | |
tree | 26b3659573426ea0111c3d5203b3eea78e508357 /docs/source | |
parent | 4e5f922341d962577d19a62ee4ed21c7de1fc8f0 (diff) | |
parent | 4ba1c0f2cad36dc23613e0dec24e7e439d3e80fd (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/conf.py | 2 | ||||
-rw-r--r-- | docs/source/license.rst | 2 | ||||
-rw-r--r-- | docs/source/whatis.rst | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/source/conf.py b/docs/source/conf.py index 3031771673e..55b2d422005 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,7 +54,7 @@ master_doc = 'index' # General information about the project. project = u'MAME Documentation' -copyright = u'2016, MAMEdev Team' +copyright = u'2017, MAMEdev Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/source/license.rst b/docs/source/license.rst index 615e9af911b..1ce48503983 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -6,7 +6,7 @@ The MAME project as a whole is distributed under the terms of the `GNU General P Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo, or wordmark. - Copyright (C) 1997-2016 MAMEDev and contributors + Copyright (C) 1997-2017 MAMEDev and contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/docs/source/whatis.rst b/docs/source/whatis.rst index 1233ad00080..98897104855 100644 --- a/docs/source/whatis.rst +++ b/docs/source/whatis.rst @@ -7,7 +7,7 @@ MAME's purpose is to preserve decades of software history. As electronic technol | | **MAME(R), the Multiple Arcade Machine Emulator** -| **Copyright (c) 1997-2016 by Nicola Salmoria and the MAME team** +| **Copyright (c) 1997-2017 by Nicola Salmoria and the MAME team** | **MAME is a trademark owned by Nicola Salmoria** | |