archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 41933:

Browse source 
* 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
This commit is contained in:
nagachika 2013-07-22 16:37:04 +00:00
parent 14044110e0
commit e44b8eb3ad
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> Tue Jul 23 01:34:00 2013 Koichi Sasada <ko1@atdot.net>
* test/test_tracer.rb: catch up recent rubygems changes. * test/test_tracer.rb: catch up recent rubygems changes.

2
lib/rubygems/psych_additions.rb
View file

@ -3,7 +3,7 @@
# in Specification._load, but if we don't have the constant, Marshal # in Specification._load, but if we don't have the constant, Marshal
# blows up. # blows up.
module Psych module Psych # :nodoc:
class PrivateType class PrivateType
end end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-07-23" #define RUBY_RELEASE_DATE "2013-07-23"
#define RUBY_PATCHLEVEL 276 #define RUBY_PATCHLEVEL 277
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7