naruse	2012-06-26 20:36:27 +0900 (Tue, 26 Jun 2012)

  New Revision: 36223

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36223

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36222)
+++ ruby_1_9_3/ChangeLog	(revision 36223)
@@ -1,3 +1,9 @@
+Tue Jun 26 20:35:59 2012  Eric Hodel  <drbrain@s...>
+
+	* 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  <naruse@r...>
 
 	* thread.c (rb_threadptr_execute_interrupts_common):
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36222)
+++ ruby_1_9_3/version.h	(revision 36223)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/