summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-11 01:24:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-11 01:24:05 +0000
commit160daa1dbc040eddf72fdf822aa14c6beb7ef8ea (patch)
tree7587bbdf6d08f02707f6f897eeade7abeb28f8d8
parent0ced6054342c27a0d1d93f4d767ea14c5b020475 (diff)
* lib/rdoc/options.rb ():
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14984 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rdoc/options.rb2
-rw-r--r--version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 85975bd571..d2de379414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 11 10:24:03 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/options.rb ():
+
Thu Jan 10 10:53:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb
index bea7e6bdcd..7e35abdb0b 100644
--- a/lib/rdoc/options.rb
+++ b/lib/rdoc/options.rb
@@ -544,7 +544,7 @@ class Options
# so we'll bypass the test under Windows
def check_diagram
- return if RUBY_PLATFORM =~ /win/
+ return if RUBY_PLATFORM =~ /mswin|cygwin|mingw|bccwin/
ok = false
ver = nil
diff --git a/version.h b/version.h
index 529f06a2c7..1e02ee5539 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-01-10"
+#define RUBY_RELEASE_DATE "2008-01-11"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080110
+#define RUBY_RELEASE_CODE 20080111
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];