summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-04 10:27:07 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-04 10:27:07 +0000
commit8c36fa1316dfe670534a8f2ef532b866e1ca1fdb (patch)
tree568c65f427da8514e6861a231d76996bf8ca317d /ChangeLog
parent4313bec63110d061334d470c77d2394367f22702 (diff)
merges r28834 from trunk into ruby_1_9_2.
-- * thread_win32.c (native_thread_join): need to wait thread, of course. [ruby-dev:41911] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28855 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 7a3cb9a73e..c87a4c8ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 2 16:34:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (native_thread_join): need to wait thread, of course.
+ [ruby-dev:41911]
+
Mon Aug 2 12:22:22 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (file_expand_path): wrong condition. [ruby-core:31591]