diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 15:35:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-09-15 15:35:31 +0000 |
| commit | 2cd6800fd8437b1f862f3f5c44db877159271d17 (patch) | |
| tree | b409b6ab98ee956beeb52406c43dd2df42ef8252 | |
| parent | 363ed27fa7a9f95111e2dfa0df8ae120cfc95d8d (diff) | |
| download | ruby-2cd6800fd8437b1f862f3f5c44db877159271d17.tar.gz | |
* 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
| -rw-r--r-- | COPYING | 4 | ||||
| -rw-r--r-- | COPYING.ja | 6 | ||||
| -rw-r--r-- | ChangeLog | 11 |
3 files changed, 16 insertions, 5 deletions
@@ -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 diff --git a/COPYING.ja b/COPYING.ja index aa2a163848..5b5b91c149 100644 --- a/COPYING.ja +++ b/COPYING.ja @@ -1,6 +1,6 @@ -$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL (the GNU General -Public License)$B%P!<%8%g%s(B2$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`(B -$B$r:FG[I[$G$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B +$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(B2-clause BSDL +$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G$-$^$9(B +2-clause BSDL$B$K$D$$$F$O(BBSDL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B 1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B @@ -1,3 +1,14 @@ +Thu Sep 16 00:26:00 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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. + Wed Sep 15 21:07:06 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated |