summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-18 13:54:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-18 13:54:32 +0000
commit85186dab0add187a7f02aec0abead7fd4e1c6e71 (patch)
tree3d21a1a6f607d1a49cc46dd706c6a2b3efd8f8ee /ChangeLog
parentefe5d8db6e7934e7a6e4cec3f8b134b622a63b0c (diff)
* ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at
[ruby-dev:47980] [Backport #9530] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45036 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 1cc736a38d..91adf52249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 18 22:53:34 2014 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ruby_atomic.h: fixed merge mistake of r44946. reported by ngoto at
+ [ruby-dev:47980] [Backport #9530]
+
Mon Feb 17 18:04:40 2014 Aaron Pfeifer <aaron.pfeifer@gmail.com>
* thread.c (terminate_atfork_i): fix locking mutexes not unlocked in