diff options
| author | xue <> | 2006-04-28 11:10:06 +0000 |
|---|---|---|
| committer | xue <> | 2006-04-28 11:10:06 +0000 |
| commit | 2cc93773feb5e76d2dd002b1dcd463a01d606794 (patch) | |
| tree | c3615e1183fa6db678dbdf08b07c25543a2cde09 /.gitattributes | |
| parent | 1f63d5c05ba117e0158c02d5bc79fa1f38f8ce85 (diff) | |
Merge from 3.0 branch till 985.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index fc04fe48..df9af126 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1021,9 +1021,12 @@ tests/FunctionalTests/config.php -text tests/FunctionalTests/features.php -text tests/FunctionalTests/features/index.php -text tests/FunctionalTests/features/protected/application.xml -text +tests/FunctionalTests/features/protected/controls/LabeledTextBox.tpl -text +tests/FunctionalTests/features/protected/controls/LabeledTextbox.php -text tests/FunctionalTests/features/protected/controls/Layout.php -text tests/FunctionalTests/features/protected/controls/Layout.tpl -text tests/FunctionalTests/features/protected/pages/ColorPicker.page -text +tests/FunctionalTests/features/protected/pages/CompositeControl.page -text tests/FunctionalTests/features/protected/pages/DatePicker.page -text tests/FunctionalTests/features/protected/pages/FeatureList.page -text tests/FunctionalTests/features/protected/pages/FeatureList.php -text @@ -1035,6 +1038,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/CompositeControlTestCase.php -text tests/FunctionalTests/index.php -text tests/FunctionalTests/quickstart.php -text tests/FunctionalTests/quickstart/Advanced/I18N.php -text @@ -1155,6 +1159,7 @@ tests/FunctionalTests/tickets/protected/pages/Ticket27.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 +tests/FunctionalTests/tickets/protected/pages/Ticket68.page -text tests/FunctionalTests/tickets/protected/pages/Ticket72.page -text tests/FunctionalTests/tickets/protected/pages/Ticket72.php -text tests/FunctionalTests/tickets/protected/pages/config.xml -text |