From 1f560ccd8a9e21871dbedd548fc97f231131c771 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 30 Aug 2006 12:33:43 +0000
Subject: merge from 3.0 branch till 1363.

---
 .gitattributes | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 4620c7a8..b158779a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1643,6 +1643,7 @@ framework/TComponent.php -text
 framework/TModule.php -text
 framework/TService.php -text
 framework/Util/TDataFieldAccessor.php -text
+framework/Util/TDateTimeStamp.php -text
 framework/Util/TLogRouter.php -text
 framework/Util/TLogger.php -text
 framework/Util/TParameterModule.php -text
@@ -1678,15 +1679,24 @@ framework/Web/Javascripts/extended/event.js -text
 framework/Web/Javascripts/extended/string.js -text
 framework/Web/Javascripts/extra/json.js -text
 framework/Web/Javascripts/extra/logger.js -text
-framework/Web/Javascripts/js/ajax.js -text
-framework/Web/Javascripts/js/clientscripts.php -text
-framework/Web/Javascripts/js/colorpicker.js -text
-framework/Web/Javascripts/js/datepicker.js -text
-framework/Web/Javascripts/js/effects.js -text
-framework/Web/Javascripts/js/logger.js -text
-framework/Web/Javascripts/js/prado.js -text
-framework/Web/Javascripts/js/rico.js -text
-framework/Web/Javascripts/js/validator.js -text
+framework/Web/Javascripts/js/compressed/ajax.js -text
+framework/Web/Javascripts/js/compressed/clientscripts.php -text
+framework/Web/Javascripts/js/compressed/colorpicker.js -text
+framework/Web/Javascripts/js/compressed/datepicker.js -text
+framework/Web/Javascripts/js/compressed/effects.js -text
+framework/Web/Javascripts/js/compressed/logger.js -text
+framework/Web/Javascripts/js/compressed/prado.js -text
+framework/Web/Javascripts/js/compressed/rico.js -text
+framework/Web/Javascripts/js/compressed/validator.js -text
+framework/Web/Javascripts/js/debug/ajax.js -text
+framework/Web/Javascripts/js/debug/clientscripts.php -text
+framework/Web/Javascripts/js/debug/colorpicker.js -text
+framework/Web/Javascripts/js/debug/datepicker.js -text
+framework/Web/Javascripts/js/debug/effects.js -text
+framework/Web/Javascripts/js/debug/logger.js -text
+framework/Web/Javascripts/js/debug/prado.js -text
+framework/Web/Javascripts/js/debug/rico.js -text
+framework/Web/Javascripts/js/debug/validator.js -text
 framework/Web/Javascripts/prado/activecontrols3.js -text
 framework/Web/Javascripts/prado/ajax.js -text
 framework/Web/Javascripts/prado/ajax3.js -text
@@ -1997,6 +2007,7 @@ tests/FunctionalTests/tickets/protected/pages/Ticket285.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket306.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket311.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket312.page -text
+tests/FunctionalTests/tickets/protected/pages/Ticket351.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54.page -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.php -text
 tests/FunctionalTests/tickets/protected/pages/Ticket54Master.tpl -text
@@ -2195,6 +2206,7 @@ tests/unit/SQLMap/sqlite.xml -text
 tests/unit/SQLMap/sqlite/backup.db -text
 tests/unit/SQLMap/sqlite/tests.db -text
 tests/unit/TComponentTest.php -text
+tests/unit/Util/DateTimeStampTestCase.php -text
 tests/unit/Web/TAssetManagerTest.php -text
 tests/unit/Web/THttpCookieCollectionTest.php -text
 tests/unit/Web/THttpCookieTest.php -text
-- 
cgit v1.2.3