summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author balr0g <balrog032@gmail.com>2015-05-25 15:37:57 -0400
committer balr0g <balrog032@gmail.com>2015-05-25 15:37:57 -0400
commit67347dc82864f441ef7304bf305135e8abd68ce3 (patch)
treec88143a81f572ec6a288de4277ab5313fe5c1660
parentc702261bae666b80c14f3749cea7b67b43d6988b (diff)
More minor changes (nw)
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 2dc5dd6892c..6bcfc844e40 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ The MESS and MAME projects live in the same source repository and share much of
License
=======
-MAME is in the process of becoming an Open Source project. We are still in process of contacting all developers from the past. We have received approval for the vast majority of contributions.
+MAME is in the process of becoming an Free and Open Source project. We are still in process of contacting all developers from the past. We have received approval for the vast majority of contributions.
-Going forward, we will be using the 3-Clause BSD license for the core, and the LGPL version 2.1 or later, and the GPL version 2.0 or later, for certain drivers. As a whole, MAME will be delivered under the GPL version 2.0 or later.
+Going forward, we will be using the 3-Clause BSD license for the core; and the LGPL version 2.1 or later, and the GPL version 2.0 or later, for certain drivers. As a whole, MAME will be delivered under the GPL version 2.0 or later.
As we are still contacting developers, MAME is still distributed under the [MAME license](docs/mamelicense.txt) as of this time. If you have not been contacted yet, and believe you have contributed code to MAME in the past, please [contact us](mailto:mamedev@mamedev.org).
How to compile?