From 9c5b2df299d8d05664f1e53dab6d99ade696795f Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 16 Jan 2009 12:14:13 +0000 Subject: merges r21521 and r21601 from trunk into ruby_1_9_1. * LEGAL: Added information for missing/langinfo.c git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ LEGAL | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index f9a3540ec..ba5e8ce0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 15 14:27:27 2009 Martin Duerst + + * LEGAL: Added information for missing/langinfo.c + Fri Jan 16 13:39:24 2009 Yuki Sonoda (Yugui) * test/minitest/unit.rb: temporarily merges Kouji's patch without diff --git a/LEGAL b/LEGAL index 96cc4fdb3..7a7e82551 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 -- cgit