From 898b9c1bda5a035196a55ee8408f89dcd017d63e Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 26 Jun 2012 11:36:27 +0000 Subject: merge revision(s) 34552: [Backport #6516] * ext/zlib/zlib.c (do_inflate): Inflate more data if buffered data exists. Allows Zlib::Inflate#set_dictionary to work. [ruby-trunk - Bug #5929] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9a270887f..87e7f1ee4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 26 20:35:59 2012 Eric Hodel + + * ext/zlib/zlib.c (do_inflate): Inflate more data if buffered data + exists. Allows Zlib::Inflate#set_dictionary to work. + [ruby-trunk - Bug #5929] + Thu Jun 21 13:42:57 2012 NARUSE, Yui * thread.c (rb_threadptr_execute_interrupts_common): diff --git a/version.h b/version.h index 952b969e74..d458c54406 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 237 +#define RUBY_PATCHLEVEL 238 -#define RUBY_RELEASE_DATE "2012-06-21" +#define RUBY_RELEASE_DATE "2012-06-26" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" -- cgit v1.2.3