summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-23 09:19:10 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-01-23 09:19:10 +0000
commit3c0ebab6f1598377fc652ec2ebe2411d19bd1bc8 (patch)
treeae8d848eac216df559209b93f5a3b51d22b9e54f /ChangeLog
parent6c0276184917d810d14dd97bd8cf16aed93e4bc7 (diff)
merge revision(s) r34350:
* encoding.c (rb_enc_compatible): fix segv on symbols. [ruby-core:42204] [Bug #5921] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 781c29acd3..b9c5e4c66c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 23 18:18:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (rb_enc_compatible): fix segv on symbols.
+ [ruby-core:42204] [Bug #5921]
+
Tue Jan 17 17:18:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (SPT_TYPE): enable as SPT_REUSEARGV on Darwin.