summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-06-16 03:20:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-06-16 03:20:55 +0000
commitaccd7f69736c5eade1631f7b092cc96c2046725f (patch)
tree031c17391b1cbf9b5bdf595546a9639422e732b5 /doc
parentf4fe2a76b0564e8e572936dec3bd724ac22b7a44 (diff)
merge revision(s) af1e487e9bb763b939dc6704c9a343c9eafa1637,6f8ac2cb28f99a4b2588c59ec44eff6ed38c4d3b: [Backport #15801]
Updated marked commits for ChangeLog Include the beginning commit in ChangeLog git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog-20165
-rw-r--r--doc/ChangeLog-20176
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/ChangeLog-2016 b/doc/ChangeLog-2016
index c708428a93..14fcba55ab 100644
--- a/doc/ChangeLog-2016
+++ b/doc/ChangeLog-2016
@@ -1,5 +1,6 @@
------------------------------------------------------------------------
-r56645 | naruse | 2016-11-07 00:56:27 +0900 (Mon, 07 Nov 2016) | 1 line
+r57181 | matz | 2016-12-26 01:35:51 +0900 (Mon, 26 Dec 2016) | 2 lines
+
+version.h (RUBY_VERSION): 2.5.0 development has started.
-Obsolete ChangeLog [Feature #12283]
------------------------------------------------------------------------
diff --git a/doc/ChangeLog-2017 b/doc/ChangeLog-2017
new file mode 100644
index 0000000000..82c4f7c623
--- /dev/null
+++ b/doc/ChangeLog-2017
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------
+r61474 | matz | 2017-12-25 23:05:59 +0900 (Mon, 25 Dec 2017) | 2 lines
+
+version.h (RUBY_VERSION): 2.6.0 development has started.
+
+------------------------------------------------------------------------