naruse	2010-09-16 00:35:31 +0900 (Thu, 16 Sep 2010)

  New Revision: 29262

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29262

  Log:
    * 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.

  Modified files:
    trunk/COPYING
    trunk/COPYING.ja
    trunk/ChangeLog

Index: COPYING
===================================================================
--- COPYING	(revision 29261)
+++ COPYING	(revision 29262)
@@ -1,6 +1,6 @@
 Ruby is copyrighted free software by Yukihiro Matsumoto <matz@n...>.
-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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29261)
+++ ChangeLog	(revision 29262)
@@ -1,3 +1,14 @@
+Thu Sep 16 00:26:00 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@f...>
 
 	* ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated
Index: COPYING.ja
===================================================================
--- COPYING.ja	(revision 29261)
+++ COPYING.ja	(revision 29262)
@@ -1,6 +1,6 @@
-本プログラムはフリーソフトウェアです．GPL (the GNU General
-Public License)バージョン2または以下に示す条件で本プログラム
-を再配布できます．GPLについてはGPLファイルを参照して下さい．
+本プログラムはフリーソフトウェアです．2-clause BSDL
+または以下に示す条件で本プログラムを再配布できます
+2-clause BSDLについてはBSDLファイルを参照して下さい．
 
   1. 複製は制限なく自由です．
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/