From 9c215874b929cc62ebb0a41eb1993d37d6abcb73 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 29 Mar 2013 04:23:42 +0000
Subject: * 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
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

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.
-- 
cgit v1.2.3