From 1c32172efb18e8d08ea483e2460813670ebfe1a5 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 30 Sep 2006 18:40:40 +0000
Subject: merge from 3.0 branch till 1451.

---
 .gitattributes | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 7a0601f9..20b15a72 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2030,6 +2030,7 @@ tests/FunctionalTests/features/protected/pages/I18N/Home.zh_CN.page -text
 tests/FunctionalTests/features/protected/pages/I18N/config.xml -text
 tests/FunctionalTests/features/protected/pages/RatingList.page -text
 tests/FunctionalTests/features/protected/pages/ValidatorEffects.page -text
+tests/FunctionalTests/features/tests/MyTestCase.php -text
 tests/FunctionalTests/index.php -text
 tests/FunctionalTests/quickstart/ActiveControls/ActiveButtonTestCase.php -text
 tests/FunctionalTests/quickstart/ActiveControls/ActiveCheckBoxTestCase.php -text
@@ -2173,6 +2174,28 @@ tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php -text
 tests/FunctionalTests/validators/tests/RequiredListTestCase.php -text
 tests/FunctionalTests/validators/tests/ValidationSummaryTestCase.php -text
+tests/test_tools/selenium/core/lib/cssQuery/cssQuery-p.js -text
+tests/test_tools/selenium/core/lib/cssQuery/src/cssQuery-level2.js -text
+tests/test_tools/selenium/core/lib/cssQuery/src/cssQuery-level3.js -text
+tests/test_tools/selenium/core/lib/cssQuery/src/cssQuery-standard.js -text
+tests/test_tools/selenium/core/lib/cssQuery/src/cssQuery.js -text
+tests/test_tools/selenium/core/lib/prototype.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/builder.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/controls.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/dragdrop.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/effects.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/scriptaculous.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/slider.js -text
+tests/test_tools/selenium/core/lib/scriptaculous/unittest.js -text
+tests/test_tools/selenium/core/scripts/injection.html -text
+tests/test_tools/selenium/core/scripts/injection_iframe.html -text
+tests/test_tools/selenium/core/scripts/js2html.js -text
+tests/test_tools/selenium/core/scripts/narcissus-defs.js -text
+tests/test_tools/selenium/core/scripts/narcissus-exec.js -text
+tests/test_tools/selenium/core/scripts/narcissus-parse.js -text
+tests/test_tools/selenium/core/scripts/se2html.js -text
+tests/test_tools/selenium/php/TestSuiteHeader.php -text
+tests/test_tools/selenium/reference.html -text
 tests/test_tools/simpletest/collector.php -text
 tests/test_tools/simpletest/compatibility.php -text
 tests/test_tools/simpletest/cookies.php -text
-- 
cgit v1.2.3