summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-01 15:23:08 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-01 15:23:08 +0000
commit49fed34108ed181fa43f6396d9ff19c7243d2bf6 (patch)
treecde89ff3185fdc572bc5197cf21f077a2dc71f50 /version.h
parentf2013ff844a456cdf81d74c4ac9b229d35bcec2a (diff)
merge revision(s) r45271: [Backport #9592] [Backport #9671]
* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown error reasons with old OpenSSL, and insert a colon iff formatted message is not empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45778 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 b033e58c7a..90c452302b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-01"
-#define RUBY_PATCHLEVEL 82
+#define RUBY_RELEASE_DATE "2014-05-02"
+#define RUBY_PATCHLEVEL 83
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 2
#include "ruby/version.h"