summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-22 08:54:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-22 08:54:43 +0000
commit76ddadeb1ad5ba049efdd6463bf6169426127985 (patch)
tree90280836dd49b06aae21fff9e2fa8cb30e00333b /version.h
parent330dccb9b444ec93660bf9e03fb7fa1b1c8619b8 (diff)
merge revision(s) 44637: [Backport #9385]
* lib/open-uri.rb: Make proxy disabling working again. Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45125 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 6de4c639a7..d3149d7c03 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-22"
-#define RUBY_PATCHLEVEL 69
+#define RUBY_PATCHLEVEL 70
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2