diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-19 17:14:45 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-19 17:14:45 +0000 |
commit | b903bbe4bfd8c3b75cbfa231a6ee3d15ef1370d2 (patch) | |
tree | efd6b141b0acb9a48e646c1b9627df0859347d38 | |
parent | a4a49a8d4ccb8d9bc5facb7220c63a7befbee950 (diff) |
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
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ext/openssl/lib/openssl/buffering.rb | 31 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 26 insertions, 16 deletions
@@ -1,3 +1,12 @@ +Thu Feb 20 02:14:18 2014 Zachary Scott <e@zzak.io> + + * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright + +Thu Feb 20 02:14:18 2014 Zachary Scott <e@zzak.io> + + * 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@segment7.net> * ext/.document: Add syslog/lib to documentable items. [Bug #9228] diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb index 51bc968e3a..e191a00877 100644 --- a/ext/openssl/lib/openssl/buffering.rb +++ b/ext/openssl/lib/openssl/buffering.rb @@ -1,18 +1,19 @@ -=begin -= $RCSfile$ -- Buffering mix-in module. - -= Info - 'OpenSSL for Ruby 2' project - Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org> - 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@notwork.org> +# 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. @@ -1,6 +1,6 @@ #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 |