summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:26:51 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-06-10 07:26:51 +0000
commitca75e7b97e4618681a8c27807dce44ae6724039e (patch)
tree3a0fd1c41fc3b67d46d9ebe16060f423dabda577 /ChangeLog
parent9e7993794f54d1f5ed17f87adf65e86df69647ae (diff)
merge revision(s) 54721: [Backport #12311]
* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime documentation to RDoc from Markdown. [ruby-core:75136] [Bug #12311] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index afd499eb88..c99b45f543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 10 16:24:29 2016 Marcus Stollsteimer <sto.mar@web.de>
+
+ * ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
+ documentation to RDoc from Markdown.
+ [ruby-core:75136] [Bug #12311]
+
Fri Jun 10 16:19:14 2016 Aaron Patterson <aaron.patterson@gmail.com>
* lib/rubygems/core_ext/kernel_require.rb: -I should always win over