diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-22 16:37:04 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-22 16:37:04 +0000 |
commit | e44b8eb3ad2b1dcc5870a4db66c6741d66ddc82c (patch) | |
tree | f6187dcd0fa4ad9517d9c7bda05c22c7ef124604 | |
parent | 14044110e07b779d4eb6737b35b5e2a3bde080fd (diff) |
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
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/rubygems/psych_additions.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Tue Jul 23 01:36:43 2013 Zachary Scott <e@zzak.io> + + * lib/rubygems/psych_additions.rb: Ignore Psych docs here + Tue Jul 23 01:34:00 2013 Koichi Sasada <ko1@atdot.net> * 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 @@ -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 |