aboutsummaryrefslogtreecommitdiffstats
path: root/gem_prelude.rb
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-07 10:59:44 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-07 10:59:44 +0000
commitce9c95293757a211bf9dcdb45908a835e5080f7d (patch)
tree1b7e1f8f8dc8eff9e634c21f1b0462e75ca56bdc /gem_prelude.rb
parent09e1383bcf4cb28a9a55e7d25277194b0222d051 (diff)
downloadruby-ce9c95293757a211bf9dcdb45908a835e5080f7d.tar.gz
Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk
Conflicts: ChangeLog git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gem_prelude.rb')
0 files changed, 0 insertions, 0 deletions