summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-29 04:23:42 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-29 04:23:42 +0000
commit9c215874b929cc62ebb0a41eb1993d37d6abcb73 (patch)
tree292274d632ecab5f988f32d9b1c8376f170931d1 /ChangeLog
parentb97e925571e32dff40573af7991d7dfe7fc9c7ce (diff)
* include/ruby/missing.h: fixed merge mistake of r39985.
[Backport #8080] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39995 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 ce748258d7..8e55602d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 29 13:22:15 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/missing.h: fixed merge mistake of r39985.
+ [Backport #8080]
+
Thu Mar 28 19:01:54 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* include/ruby/missing.h: removed __linux__. it's unnecessary.