summaryrefslogtreecommitdiffstatshomepage
path: root/README.md
diff options
context:
space:
mode:
author balr0g <balrog032@gmail.com>2016-03-04 10:36:24 -0500
committer balr0g <balrog032@gmail.com>2016-03-04 10:37:52 -0500
commit42291f0367b4eaddae168c805f6aa20a26efc401 (patch)
treee2896a6e1454b2ac3a41eb9f2a4aaf261c76f28e /README.md
parentaa2d32e426d0cf048e3b5e8f72ce84da7e8b1b72 (diff)
minor README adjustments (nw)
Diffstat (limited to 'README.md')
-rw-r--r--README.md40
1 files changed, 16 insertions, 24 deletions
diff --git a/README.md b/README.md
index 15ff18af586..4cdcd8e7d03 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ For Linux users we have provided you with all the [prerequisites](http://forums.
For recent versions of OSX you need to install [Xcode](https://developer.apple.com/xcode/) including command-line tools and [SDL 2.0](https://www.libsdl.org/download-2.0.php).
-For Windows users, we provide a ready-made [build environment](http://mamedev.org/tools/) based on MinGW-w64.
+For Windows users, we provide a ready-made [build environment](http://mamedev.org/tools/) based on MinGW-w64.
Visual Studio builds are also possible, but you still need [build environment](http://mamedev.org/tools/) based on MinGW-w64.
In order to generate solution and project files just run:
@@ -73,32 +73,24 @@ All contributors need to either add a standard header for license info (on new f
License
=======
-The MAME project as a whole is distributed under the terms of the [GNU General Public License, 2](http://opensource.org/licenses/GPL-2.0) (GPL-2.0), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause License](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new contributors to distribute files under this license.
+The MAME project as a whole is distributed under the terms of the [GNU General Public License, version 2 or later](http://opensource.org/licenses/GPL-2.0) (GPL-2.0+), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause License](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new contributors to distribute files under this license.
-Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo or wordmark.
+Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo, or wordmark.
-[License (GPL-2.0)](LICENSE)
-============================
+ Copyright (C) 1997-2016 MAMEDev and contributors
-<a href="http://opensource.org/licenses/GPL-2.0" target="_blank">
-<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
-</a>
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-<pre>
-MAME
-Copyright (C) 1997-2016 Nicola Salmoria and the MAME team
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-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 the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-</pre>
+Please see [LICENSE.md](LICENSE.md) for further details.