summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 06:55:00 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 06:55:00 +0000
commite6a5f817d613dbd40cf2d19cd0705a1b4c377538 (patch)
tree0e38c2d393104777c836c80036c0e9945098fb09 /version.h
parentdd7f1cdfbd8215ee46c11175bfd2f4fd3569f34a (diff)
merge revision(s) 48534: [Backport #10412]
* lib/resolv.rb: fall back if canonicalization fails. Thanks Vit Ondruch for the patch! [ruby-core:65836] * test/resolv/test_dns.rb: test for patch git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/version.h b/version.h
index b1fc13278d..eeeee540c2 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-11-28"
-#define RUBY_PATCHLEVEL 606
+#define RUBY_RELEASE_DATE "2015-01-14"
+#define RUBY_PATCHLEVEL 607
-#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_YEAR 2015
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 14
#include "ruby/version.h"