summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 12:14:13 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 12:14:13 +0000
commit9790f364fa1d3c4d759cf3c6575fb86287429712 (patch)
tree604c135555645e198c3888c7790a1f622a93aed1
parent051f55adea5ecabb5bb979345f859e3039f7658f (diff)
merges r21521 and r21601 from trunk into ruby_1_9_1.
* LEGAL: Added information for missing/langinfo.c git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--LEGAL11
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f9a3540ec3..ba5e8ce0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 15 14:27:27 2009 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * LEGAL: Added information for missing/langinfo.c
+
Fri Jan 16 13:39:24 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/minitest/unit.rb: temporarily merges Kouji's patch without
diff --git a/LEGAL b/LEGAL
index 96cc4fdb39..7a7e825510 100644
--- a/LEGAL
+++ b/LEGAL
@@ -260,6 +260,17 @@ missing/strlcpy.c
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+missing/langinfo.c
+
+ This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
+ Ruby uses a modified version. The file contains the following
+ author/copyright notice:
+
+ Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
+ Permission to use, copy, modify, and distribute this software
+ for any purpose and without fee is hereby granted. The author
+ disclaims all warranties with regard to this software.
+
ext/digest/md5/md5.[ch]:
These files are under the following license. Ruby uses modified