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 | 0162e83dfaf238deeb89ba2f99aa3384e87b3080 (patch) | |
tree | 087bcb7a1939f720f9bb7f3895c8d75ec16c3883 /version.h | |
parent | b38dcb30b4284a2ce62746bf51f7a3429a7d41b0 (diff) | |
download | ruby-0162e83dfaf238deeb89ba2f99aa3384e87b3080.tar.gz |
* version.h: commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-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[]; |