summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 15:35:31 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 15:35:31 +0000
commit2cd6800fd8437b1f862f3f5c44db877159271d17 (patch)
treeb409b6ab98ee956beeb52406c43dd2df42ef8252 /COPYING
parent363ed27fa7a9f95111e2dfa0df8ae120cfc95d8d (diff)
* COPYING: change Ruby's License from a dual license with GPLv2
to a dual license with 2-clause BSDL. [ruby-dev:42166] [ruby-core:31971] [ruby-dev:39167] [ruby-core:25272] * COPYING.ja: ditto. * BSDL: added. this is from The FreeBSD License. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 9043404a83..a1f19ff99d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
1. You may make and give away verbatim copies of the source form of the
software without restriction, provided that you duplicate all of the