summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-02 13:46:46 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-02 13:46:46 +0000
commit3da0a0cead8eb70dba54d291151d2e9458a0159d (patch)
tree49f5927d7a823dd585085de02cd6aad58f8d9e3b /version.h
parent484a6ffb788fd0f0ee5fc6448125a7e0980c0c4d (diff)
merge revision(s) 44630,44631: [Backport #9403]
* lib/delegate.rb (Delegator): keep source information methods which start and end with '__'. [ruby-core:58572] [Bug #9155] which start and end with '__'. [ruby-core:59718] [Bug #9403] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 1bc3dec1f1..a62e4f128d 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-02-01"
-#define RUBY_PATCHLEVEL 14
+#define RUBY_RELEASE_DATE "2014-02-02"
+#define RUBY_PATCHLEVEL 15
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
#include "ruby/version.h"