summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-30 07:13:13 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-30 07:13:13 +0000
commitd65000915192052ea5a54ece9b001a0a84aa6c4c (patch)
tree7761223ad3558aabd4d6c21ee3f844fb0f5c8a79 /version.h
parent8d4aeb83454fa4ae5f48b06973867ec0b4771153 (diff)
merge revision(s) 49223: [Backport #10732]
* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with CR. should check if substitution occurred too. [ruby-dev:48813] [Bug #10732] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49445 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 1659e8e381..3b636afa1b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-01-30"
-#define RUBY_PATCHLEVEL 625
+#define RUBY_PATCHLEVEL 626
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1