diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-14 07:46:36 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-14 07:46:36 +0000 |
commit | 2c81a1fa523c27fcf9f5646a673537d15a955a28 (patch) | |
tree | a97046e22b7283456f220b055628e7d17c1361b7 /version.h | |
parent | 432ec4f2c4fdae76c2ff161b15eabe84f5b27e6a (diff) |
merge revision(s) 15464:
* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
stack. [ruby-core:15458]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2008-06-13" +#define RUBY_RELEASE_DATE "2008-06-14" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20080613 -#define RUBY_PATCHLEVEL 174 +#define RUBY_RELEASE_CODE 20080614 +#define RUBY_PATCHLEVEL 175 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |