summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-10 14:46:41 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-10 14:46:41 +0000
commit4f0899d4bba4a03c4de45e742f9e37a89b8b32e2 (patch)
tree191e375fbacc7f4c24d65c4d08732fc6b69e2fdb /version.h
parent0e0d0c47b890ffea4c8bceb28c0573aa50010e27 (diff)
merge revision(s) 63823,63839: [Backport #14890]
time.c: [DOC] Time#localtime * time.c: state that Time#localtime does nothing when nothing changes. [ruby-core:87675] [Bug #14880] skip test_localtime_zone if force_tz_test is false For example Solaris https://rubyci.org/logs/rubyci.s3.amazonaws.com/unstable10x/ruby-trunk/log/20180703T091803Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index ebc3f21d32..08f64ff5f7 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.4"
#define RUBY_RELEASE_DATE "2019-01-10"
-#define RUBY_PATCHLEVEL 126
+#define RUBY_PATCHLEVEL 127
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1