diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:26 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:22:26 +0000 |
commit | 16b5c5e928b85c387a79f5ce846f68b6db98bd9d (patch) | |
tree | 724ba966419443de8044b5feaaca3257e5ddce01 /version.h | |
parent | 2a9739f1a444ca3fdcc90d21a1504a0203d39d73 (diff) |
Mon, 22 Nov 2010 05:15:39 +0000 shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
merge revision(s) 29849:
merge revision(s) 28835,28894:
* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
* ext/win32ole/extconf.rb: ditto.
* ext/win32ole/win32ole.c: fix checking version of GCC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-11-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101122 -#define RUBY_PATCHLEVEL 316 +#define RUBY_PATCHLEVEL 317 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |