From b18befaaf7e564f6a835d81a07ecb3fa1c46ed3f Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 25 Oct 2009 14:46:51 +0000 Subject: merges r24533 from trunk into ruby_1_9_1. -- * doc/ChangeLog-1.8.0: add forgotten entry contributed by TAKAHASHI Kaoru. [ruby-dev:39065] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ doc/ChangeLog-1.8.0 | 5 +++++ version.h | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a8f292359..e77dff079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 14 00:29:22 2009 Yukihiro Matsumoto + + * doc/ChangeLog-1.8.0: add forgotten entry contributed by + TAKAHASHI Kaoru. [ruby-dev:39065] + Fri Aug 14 00:19:49 2009 Yukihiro Matsumoto * lib/delegate.rb (Delegator#method_missing): __FILE__ may contain diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0 index d168a50f8..e16c7f4f2 100644 --- a/doc/ChangeLog-1.8.0 +++ b/doc/ChangeLog-1.8.0 @@ -10516,6 +10516,11 @@ Thu Jan 17 16:21:42 2002 Yukihiro Matsumoto * eval.c (block_pass): should allow block argument relay even in the tainted mode. +Thu Jan 17 09:43:05 2002 TAKAHASHI Kaoru + + * misc/ruby-mode.el (ruby-add-log-current-method): New function + for `add-log-current-defun-function'. + Thu Jan 17 04:51:48 2002 Yukihiro Matsumoto * ext/socket/socket.c: support subclassing by proper "initialize" diff --git a/version.h b/version.h index fcce8b234..d60c23963 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 288 +#define RUBY_PATCHLEVEL 289 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit