summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-07 15:49:11 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-07 15:49:11 +0000
commitb494603551d1a6c8fbc56ba90a35451e84af4d2e (patch)
treec17473bfa180f1a46eb2cf3b2e7ba31ec934bf2f /version.h
parentde94db5d61dddfada92dd07a2c1885d79c74e751 (diff)
merge revision(s) r44619:
test_gc.rb: relax assertion * test/ruby/test_gc.rb (test_profiler_total_time): GC time may be shorter than the timer resolution. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45866 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 a5e4c2bff7..3e43f5d209 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-06"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_RELEASE_DATE "2014-05-08"
+#define RUBY_PATCHLEVEL 94
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 8
#include "ruby/version.h"