From 32089305127f6bd26bd684c75818df4fcd9c0f9d Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 25 Mar 2016 08:19:14 +0000
Subject: merge revision(s) 53202: [Backport #11843]

	* enc/windows_1250.c: Should not use C++ style comments (C99 feature).
	  [Bug #11843]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 42f22c517d..92babe5b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 17:18:59 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* enc/windows_1250.c: Should not use C++ style comments (C99 feature).
+	  [Bug #11843]
+
 Fri Mar 25 17:15:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* enc/iso_8859_2.c, enc/windows_1250.c: separate Windows-1250
-- 
cgit v1.2.3