Skip to content

Commit

Permalink
* COPYING: change Ruby's License from a dual license with GPLv2
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
nurse committed Sep 15, 2010
1 parent 363ed27 commit 2cd6800
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Ruby is copyrighted free software by Yukihiro Matsumoto <[email protected]>.
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
Expand Down
6 changes: 3 additions & 3 deletions COPYING.ja
Original file line number Diff line number Diff line change
@@ -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

Expand Down
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Thu Sep 16 00:26:00 2010 NARUSE, Yui <[email protected]>

* 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 <[email protected]>

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

0 comments on commit 2cd6800

Please sign in to comment.