summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 09:34:47 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 09:34:47 +0000
commit3a2effbd6bebfa01abbbf8544543a643d142801c (patch)
tree35586f83167cc3b2f2f2dce674019b9cb8d87c69 /ChangeLog
parent77e74bef16ef1d600b8e907603d5d89379b479ee (diff)
merge revision(s) 54510: [Backport #12256]
* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in comments. [ruby-core:74838] [Bug #12256] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54697 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 2f31ac0264..a3dcce8a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 22 18:34:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+ comments. [ruby-core:74838] [Bug #12256]
+
Fri Apr 22 18:30:50 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.