summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:34:45 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:34:45 +0000
commite94bc257290a94607cfe1ca98cfbd46d39056908 (patch)
treee2fc62d33b18eed7de99ab8e1ea1781ee3713191 /ChangeLog
parentb5d29771b941d490539cffa9645927c301e98afe (diff)
merges r30467 from trunk into ruby_1_9_2.
-- * ext/stringio/stringio.c (get_strio, strio_set_string) (strio_reopen): check if frozen. [ruby-core:33648] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30565 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 fb78e0cefe..81ec666c39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 6 05:14:41 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (get_strio, strio_set_string)
+ (strio_reopen): check if frozen. [ruby-core:33648]
+
Wed Jan 5 13:56:54 2011 Akinori MUSHA <knu@iDaemons.org>
* lib/net/http.rb (Net::HTTP#get): A header hash given should not