From df63499b2e7ac2e207cacec7e1090793d44b8298 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2009 15:39:38 +0000
Subject: merges r21511 from trunk into ruby_1_9_1. * encoding.c
 (rb_locale_charmap): fallback to codepage if no   locale is found. 
 [ruby-core:21110]

* missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
  locale is found.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index a46b4db6b..1f1048ff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jan 14 23:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_locale_charmap): fallback to codepage if no
+	  locale is found.  [ruby-core:21110]
+
+	* missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
+	  locale is found.
+
 Wed Jan 14 22:38:30 2009  Tanaka Akira  <akr@fsij.org>
 
 	* gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
-- 
cgit