summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-29 08:40:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-09-29 08:40:40 +0000
commitd3fb88d09aea446e670eeab9864b333b22332451 (patch)
tree3e2fc873e8d25271f1a7e6f3f23635db112b55b3 /version.h
parent4a4a83c981b1f51f625073fbd63f8dc8a9f53044 (diff)
merge revision(s) 51820: [Backport #11519]
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal encoding beginning with an interpolation same as the source file encoding. [ruby-core:70703] [Bug #11519] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51978 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 ce33fad329..691761ea6d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.8"
#define RUBY_RELEASE_DATE "2015-09-29"
-#define RUBY_PATCHLEVEL 404
+#define RUBY_PATCHLEVEL 405
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 9