diff options
| author | xue <> | 2006-04-16 18:02:31 +0000 |
|---|---|---|
| committer | xue <> | 2006-04-16 18:02:31 +0000 |
| commit | 9db90898be134c9f70c0b334ec071223e60ed76c (patch) | |
| tree | c499036f6ca4b350b3f4ae48b0d55cf8308b385d /.gitattributes | |
| parent | fc38326ea80e73717fb1d187a16421f7bc1b1b04 (diff) | |
Merge from 3.0 branch till 924
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index d131ec36..d49db2bb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -839,7 +839,6 @@ framework/Util/TDataFieldAccessor.php -text framework/Util/TLogRouter.php -text framework/Util/TLogger.php -text framework/Util/TParameterModule.php -text -framework/Util/TPropelLogRoute.php -text framework/Util/TSimpleDateFormatter.php -text framework/Util/TVarDumper.php -text framework/Web/Javascripts/TJSON.php -text @@ -1036,12 +1035,7 @@ tests/FunctionalTests/features/protected/pages/I18N/BasicI18N.php -text tests/FunctionalTests/features/protected/pages/I18N/Home.page -text 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/ImageMap/Home.page -text -tests/FunctionalTests/features/protected/pages/ImageMap/Home.php -text -tests/FunctionalTests/features/protected/pages/ImageMap/hotspot.jpg -text -tests/FunctionalTests/features/protected/pages/MultiView/Home.page -text tests/FunctionalTests/features/protected/pages/RatingList.page -text -tests/FunctionalTests/features/protected/pages/Wizard/Home.page -text tests/FunctionalTests/index.php -text tests/FunctionalTests/quickstart.php -text tests/FunctionalTests/quickstart/Advanced/I18N.php -text @@ -1160,6 +1154,23 @@ tests/FunctionalTests/tickets/tests/Ticket21TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text +tests/FunctionalTests/validators.php -text +tests/FunctionalTests/validators/index.php -text +tests/FunctionalTests/validators/protected/pages/Button.page -text +tests/FunctionalTests/validators/protected/pages/Button.php -text +tests/FunctionalTests/validators/protected/pages/CheckBox.page -text +tests/FunctionalTests/validators/protected/pages/CheckBox.php -text +tests/FunctionalTests/validators/protected/pages/ImageButton.page -text +tests/FunctionalTests/validators/protected/pages/ImageButton.php -text +tests/FunctionalTests/validators/protected/pages/Layout.php -text +tests/FunctionalTests/validators/protected/pages/Layout.tpl -text +tests/FunctionalTests/validators/protected/pages/LinkButton.page -text +tests/FunctionalTests/validators/protected/pages/LinkButton.php -text +tests/FunctionalTests/validators/protected/pages/config.xml -text +tests/FunctionalTests/validators/tests/ButtonTestCase.php -text +tests/FunctionalTests/validators/tests/CheckBoxTestCase.php -text +tests/FunctionalTests/validators/tests/ImageButtonTestCase.php -text +tests/FunctionalTests/validators/tests/LinkButtonTestCase.php -text tests/UnitTests/TODO.txt -text tests/UnitTests/framework/Collections/utList.php -text tests/UnitTests/framework/Collections/utMap.php -text |