summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 12:01:45 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 12:01:45 +0000
commit83e3d419ec936d35208ad30fe692bbb375d62270 (patch)
tree76bb27797fff3bc019bf059450d2c96e34b9d6ef /spec
parent809acc098291efb6d55e8f2fba82e7c7412ff7a5 (diff)
merges r24084 from trunk into ruby_1_9_1.
-- * .gitignore: synchronized with svn:ignore. * spec/.gitignore: merged into /.gitignore git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r--spec/.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/.gitignore b/spec/.gitignore
deleted file mode 100644
index 51a68fe8b..000000000
--- a/spec/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-rubyspec
-mspec