diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-23 15:45:01 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-23 15:45:01 +0000 |
| commit | eb2494aba1dedff2543dd8079c97091305ed2f96 (patch) | |
| tree | 087bcb7a1939f720f9bb7f3895c8d75ec16c3883 | |
| parent | 8513184c0a363213a6be8db583251a730db30125 (diff) | |
| download | ruby-eb2494aba1dedff2543dd8079c97091305ed2f96.tar.gz ruby-eb2494aba1dedff2543dd8079c97091305ed2f96.tar.xz ruby-eb2494aba1dedff2543dd8079c97091305ed2f96.zip | |
* version.h: commit miss.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -1,26 +1,14 @@ #define RUBY_VERSION "1.9.0" -<<<<<<< version.h #define RUBY_RELEASE_DATE "2005-05-24" -======= -#define RUBY_RELEASE_DATE "2005-05-24" ->>>>>>> 1.1159 #define RUBY_VERSION_CODE 190 -<<<<<<< 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 -<<<<<<< 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[]; |