From aa815c58243aad69aaa44f30883002da1ee816d8 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Feb 2012 07:09:32 +0000
Subject: merge revision(s) 33500,33501:

* gc.c (rb_gc_set_params): set parameters always.
  [ruby-dev:44648] [Bug #5467]

* gc.c (initial_params): pack in a struct.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c403cf4531..e7845d3473 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 14 15:58:31 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* gc.c (rb_gc_set_params): set parameters always.
+	  [ruby-dev:44648] [Bug #5467]
+
+	* gc.c (initial_params): pack in a struct.
+
 Tue Feb 14 15:44:42 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* test/irb/test_completion.rb: skip if cannot load irb/completion
-- 
cgit v1.2.3