diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-23 15:41:59 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-23 15:41:59 +0000 |
| commit | 8513184c0a363213a6be8db583251a730db30125 (patch) | |
| tree | 0c09fb6cc72e90ab91008d90e43ccce01394f9b4 | |
| parent | 949ecc927c92268caa20c375853bc11fa2b9662d (diff) | |
| download | ruby-8513184c0a363213a6be8db583251a730db30125.tar.gz ruby-8513184c0a363213a6be8db583251a730db30125.tar.xz ruby-8513184c0a363213a6be8db583251a730db30125.zip | |
* 2005-05-24
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -1,14 +1,26 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2005-05-23" +<<<<<<< version.h +#define RUBY_RELEASE_DATE "2005-05-24" +======= +#define RUBY_RELEASE_DATE "2005-05-24" +>>>>>>> 1.1159 #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20050523 +<<<<<<< version.h +#define RUBY_RELEASE_CODE 20050524 +======= +#define RUBY_RELEASE_CODE 20050524 +>>>>>>> 1.1159 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2005 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 23 +<<<<<<< version.h +#define RUBY_RELEASE_DAY 24 +======= +#define RUBY_RELEASE_DAY 24 +>>>>>>> 1.1159 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |