From 8ab196ce6c2d5de323bdd8ebcc11a73814c0cdca Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 26 Apr 2006 21:18:01 +0000
Subject: Merge from 3.0 branch till 971.

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

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 1f88e993..4af4a3fe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -182,6 +182,7 @@ demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page -text
 demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.php -text
 demos/quickstart/protected/pages/Controls/Samples/TDataTypeValidator/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TDataTypeValidator/Home.php -text
+demos/quickstart/protected/pages/Controls/Samples/TDatePicker/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.page -text
 demos/quickstart/protected/pages/Controls/Samples/TDropDownList/Home.php -text
 demos/quickstart/protected/pages/Controls/Samples/TEmailAddressValidator/Home.page -text
@@ -1183,6 +1184,7 @@ tests/FunctionalTests/validators/tests/ButtonTestCase.php -text
 tests/FunctionalTests/validators/tests/CheckBoxTestCase.php -text
 tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php -text
 tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php -text
+tests/FunctionalTests/validators/tests/DataTypeValidatorTestCase.php -text
 tests/FunctionalTests/validators/tests/DatePickerTestCase.php -text
 tests/FunctionalTests/validators/tests/ImageButtonTestCase.php -text
 tests/FunctionalTests/validators/tests/LinkButtonTestCase.php -text
-- 
cgit v1.2.3