From e44b8eb3ad2b1dcc5870a4db66c6741d66ddc82c Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 22 Jul 2013 16:37:04 +0000 Subject: [PATCH] merge revision(s) 41933: * lib/rubygems/psych_additions.rb: Ignore Psych docs here git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/rubygems/psych_additions.rb | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4c011884b..aad23c8c9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 23 01:36:43 2013 Zachary Scott + + * lib/rubygems/psych_additions.rb: Ignore Psych docs here + Tue Jul 23 01:34:00 2013 Koichi Sasada * test/test_tracer.rb: catch up recent rubygems changes. diff --git a/lib/rubygems/psych_additions.rb b/lib/rubygems/psych_additions.rb index 08a5cb37ea..dcc13fdf2e 100644 --- a/lib/rubygems/psych_additions.rb +++ b/lib/rubygems/psych_additions.rb @@ -3,7 +3,7 @@ # in Specification._load, but if we don't have the constant, Marshal # blows up. -module Psych +module Psych # :nodoc: class PrivateType end end diff --git a/version.h b/version.h index df9162968e..9eb5d03124 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-07-23" -#define RUBY_PATCHLEVEL 276 +#define RUBY_PATCHLEVEL 277 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7