merge -c 12127

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 372e3e2863..ffa50d077d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Mar 24 23:40:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* node.h (struct rb_thread.locals): explicit as struct.
+	  [ruby-core:10585]
+
+	* eval.c, node.h (enum rb_thread_status, struct rb_thread,
+	  rb_curr_thread, rb_main_thread): prefixed.  [ruby-core:10586]
+
+	* file.c (chompdirsep): made an unprefixed name static.
+
+	* io.c (io_fread): ditto.
+
 Tue May 22 23:27:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END