summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-31 13:47:40 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-31 13:47:40 +0000
commitab4c4d3e2b293cb40ca6a5f2a233ae3b5747e184 (patch)
treea7000ad8b4bc5b0e5b113fd32987775c65dcea6c /version.h
parent4d683d0566a16c3a7bc0d91bb92a36358613cf63 (diff)
merge revision(s) r48987,r48989: [Backport #10646]
test_io_console.rb: chomp results * test/io/console/test_io_console.rb (run_pty): IO#readlines ignores the given block. need map to chomp the results. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50140 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 bd5dbad4aa..1a570a8e5b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-03-31"
-#define RUBY_PATCHLEVEL 328
+#define RUBY_PATCHLEVEL 329
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 3