Skip to content

Commit 2cd6800

Browse files
committed
* 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
1 parent 363ed27 commit 2cd6800

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

COPYING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
2-
You can redistribute it and/or modify it under either the terms of the GPL
3-
version 2 (see the file GPL), or the conditions below:
2+
You can redistribute it and/or modify it under either the terms of the
3+
2-clause BSDL (see the file BSDL), or the conditions below:
44

55
1. You may make and give away verbatim copies of the source form of the
66
software without restriction, provided that you duplicate all of the

COPYING.ja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL (the GNU General
2-
Public License)$B%P!<%8%g%s(B2$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`(B
3-
$B$r:FG[I[$G$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
1+
$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(B2-clause BSDL
2+
$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G$-$^$9(B
3+
2-clause BSDL$B$K$D$$$F$O(BBSDL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
44

55
1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
66

ChangeLog

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Thu Sep 16 00:26:00 2010 NARUSE, Yui <naruse@ruby-lang.org>
2+
3+
* COPYING: change Ruby's License from a dual license with GPLv2
4+
to a dual license with 2-clause BSDL.
5+
[ruby-dev:42166] [ruby-core:31971]
6+
[ruby-dev:39167] [ruby-core:25272]
7+
8+
* COPYING.ja: ditto.
9+
10+
* BSDL: added. this is from The FreeBSD License.
11+
112
Wed Sep 15 21:07:06 2010 Tanaka Akira <akr@fsij.org>
213

314
* ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated

0 commit comments

Comments
 (0)