summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 15:12:30 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 15:12:30 +0000
commit256484fa25b6a4b6dae050904b46ff0fc91c24b7 (patch)
tree1b5a0f3377a71decf1f2ef410996b0e693dc02b1
parente48262774763dd0e4f5d7c73319479472c7c9975 (diff)
downloadruby-256484fa25b6a4b6dae050904b46ff0fc91c24b7.tar.gz
ruby-256484fa25b6a4b6dae050904b46ff0fc91c24b7.tar.xz
ruby-256484fa25b6a4b6dae050904b46ff0fc91c24b7.zip
merges r20163 and r20215 from trunk into ruby_1_9_1.
properties. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--[-rwxr-xr-x]lib/rubygems/timer.rb0
-rw-r--r--[-rwxr-xr-x]lib/rubygems/validator.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_cookie.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_core.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_header.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_modruby.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_multipart.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_session.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/test_cgi_tag_helper.rb0
-rw-r--r--[-rwxr-xr-x]test/cgi/testdata/file1.html0
-rw-r--r--[-rwxr-xr-x]test/cgi/testdata/large.pngbin156414 -> 156414 bytes
-rw-r--r--[-rwxr-xr-x]test/cgi/testdata/small.pngbin82 -> 82 bytes
12 files changed, 0 insertions, 0 deletions
diff --git a/lib/rubygems/timer.rb b/lib/rubygems/timer.rb
index 06250f26b..06250f26b 100755..100644
--- a/lib/rubygems/timer.rb
+++ b/lib/rubygems/timer.rb
diff --git a/lib/rubygems/validator.rb b/lib/rubygems/validator.rb
index 4595ad9a4..4595ad9a4 100755..100644
--- a/lib/rubygems/validator.rb
+++ b/lib/rubygems/validator.rb
diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb
index f9950d1fb..f9950d1fb 100755..100644
--- a/test/cgi/test_cgi_cookie.rb
+++ b/test/cgi/test_cgi_cookie.rb
diff --git a/test/cgi/test_cgi_core.rb b/test/cgi/test_cgi_core.rb
index 97fda9d87..97fda9d87 100755..100644
--- a/test/cgi/test_cgi_core.rb
+++ b/test/cgi/test_cgi_core.rb
diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb
index 58f82ba3b..58f82ba3b 100755..100644
--- a/test/cgi/test_cgi_header.rb
+++ b/test/cgi/test_cgi_header.rb
diff --git a/test/cgi/test_cgi_modruby.rb b/test/cgi/test_cgi_modruby.rb
index 4eb02fac5..4eb02fac5 100755..100644
--- a/test/cgi/test_cgi_modruby.rb
+++ b/test/cgi/test_cgi_modruby.rb
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index 47a41f648..47a41f648 100755..100644
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
diff --git a/test/cgi/test_cgi_session.rb b/test/cgi/test_cgi_session.rb
index c041b9cf5..c041b9cf5 100755..100644
--- a/test/cgi/test_cgi_session.rb
+++ b/test/cgi/test_cgi_session.rb
diff --git a/test/cgi/test_cgi_tag_helper.rb b/test/cgi/test_cgi_tag_helper.rb
index 6e726b93a..6e726b93a 100755..100644
--- a/test/cgi/test_cgi_tag_helper.rb
+++ b/test/cgi/test_cgi_tag_helper.rb
diff --git a/test/cgi/testdata/file1.html b/test/cgi/testdata/file1.html
index 2ceaf6bc3..2ceaf6bc3 100755..100644
--- a/test/cgi/testdata/file1.html
+++ b/test/cgi/testdata/file1.html
diff --git a/test/cgi/testdata/large.png b/test/cgi/testdata/large.png
index d716396fa..d716396fa 100755..100644
--- a/test/cgi/testdata/large.png
+++ b/test/cgi/testdata/large.png
Binary files differ
diff --git a/test/cgi/testdata/small.png b/test/cgi/testdata/small.png
index 753d58e3c..753d58e3c 100755..100644
--- a/test/cgi/testdata/small.png
+++ b/test/cgi/testdata/small.png
Binary files differ