1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4715c35ed..5fae6d3fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Dec 30 06:31:11 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* encoding.c (Init_encoding): register Windows-31J and its alias.
+	  [ruby-dev:32843]
+
+	* ruby.c (proc_options): -Ks options means Windows-31J, not Shift_JIS.
+
 Sun Dec 30 06:27:38 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/mkmf.rb (depend_rules): need to convert `/' to `\' for windows