nagachika	2014-02-20 02:14:45 +0900 (Thu, 20 Feb 2014)

  New Revision: 45053

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

  Log:
    merge revision(s) r43750,r43940:
    
    * ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
      OpenSSL::Buffering which breaks overview because of RDoc bug
    
    * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/openssl/lib/openssl/buffering.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45052)
+++ ruby_2_0_0/ChangeLog	(revision 45053)
@@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Feb 20 02:14:18 2014  Zachary Scott  <e@z...>
+
+	* ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright
+
+Thu Feb 20 02:14:18 2014  Zachary Scott  <e@z...>
+
+	* ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
+	  OpenSSL::Buffering which breaks overview because of RDoc bug
+
 Thu Feb 20 02:04:09 2014  Eric Hodel  <drbrain@s...>
 
 	* ext/.document:  Add syslog/lib to documentable items. [Bug #9228]
Index: ruby_2_0_0/ext/openssl/lib/openssl/buffering.rb
===================================================================
--- ruby_2_0_0/ext/openssl/lib/openssl/buffering.rb	(revision 45052)
+++ ruby_2_0_0/ext/openssl/lib/openssl/buffering.rb	(revision 45053)
@@ -1,18 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/openssl/lib/openssl/buffering.rb#L1
-=begin
-= $RCSfile$ -- Buffering mix-in module.
-
-= Info
-  'OpenSSL for Ruby 2' project
-  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@n...>
-  All rights reserved.
-
-= Licence
-  This program is licenced under the same licence as Ruby.
-  (See the file 'LICENCE'.)
-
-= Version
-  $Id$
-=end
+#
+#--
+#= $RCSfile$ -- Buffering mix-in module.
+#
+#= Info
+#  'OpenSSL for Ruby 2' project
+#  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@n...>
+#  All rights reserved.
+#
+#= Licence
+#  This program is licenced under the same licence as Ruby.
+#  (See the file 'LICENCE'.)
+#
+#= Version
+#  $Id$
+#++
 
 ##
 # OpenSSL IO buffering mix-in module.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45052)
+++ ruby_2_0_0/version.h	(revision 45053)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-02-20"
-#define RUBY_PATCHLEVEL 441
+#define RUBY_PATCHLEVEL 442
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r43750,43940


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