diff options
| author | xue <> | 2006-07-29 14:43:53 +0000 |
|---|---|---|
| committer | xue <> | 2006-07-29 14:43:53 +0000 |
| commit | e0c9de073cce5b5c9975694c03e2dbe63788bd66 (patch) | |
| tree | 0c04506594635064d9f3f62eb45c8aad5c3be685 /.gitattributes | |
| parent | 6385105e7793509de726b2941d038840c04195c1 (diff) | |
Merge from 3.0 branch till 1305.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 2d8f049d..1347c5c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -599,6 +599,7 @@ buildscripts/texbuilder/time-tracker/pages.php -text buildscripts/texbuilder/time-tracker/preface.tex -text buildscripts/texbuilder/time-tracker/time-tracker.tex -text demos/blog/index.php -text +demos/blog/protected/.htaccess -text demos/blog/protected/Common/BlogDataModule.php -text demos/blog/protected/Common/BlogErrorHandler.php -text demos/blog/protected/Common/BlogException.php -text @@ -666,6 +667,7 @@ demos/blog/themes/Summer/style.css -text demos/blog/themes/Winter/style.css -text demos/composer/index.php -text demos/composer/index2.php -text +demos/composer/protected/.htaccess -text demos/composer/protected/pages/ClassDefinition.php -text demos/composer/protected/pages/Home.page -text demos/composer/protected/pages/Home.php -text @@ -683,6 +685,7 @@ demos/helloworld/protected/.htaccess -text demos/helloworld/protected/pages/Home.page -text demos/helloworld/protected/pages/Home.php -text demos/personal/index.php -text +demos/personal/protected/.htaccess -text demos/personal/protected/Pages/Home.page -text demos/personal/protected/Pages/Home.php -text demos/personal/protected/Pages/Layout.php -text @@ -1986,6 +1989,7 @@ tests/FunctionalTests/validators/protected/pages/RangeValidatorString.page -text tests/FunctionalTests/validators/protected/pages/RegularExpressionValidator.page -text tests/FunctionalTests/validators/protected/pages/RequiredFieldValidator.page -text tests/FunctionalTests/validators/protected/pages/RequiredListValidator.page -text +tests/FunctionalTests/validators/protected/pages/StringRangeValidator.page -text tests/FunctionalTests/validators/protected/pages/ValidationSummary.page -text tests/FunctionalTests/validators/protected/pages/config.xml -text tests/FunctionalTests/validators/tests/ButtonTestCase.php -text |