diff options
| author | xue <> | 2006-12-01 12:28:55 +0000 |
|---|---|---|
| committer | xue <> | 2006-12-01 12:28:55 +0000 |
| commit | 17f49a9bc71d88c9b3e2f31a161f3689c136ac16 (patch) | |
| tree | fc77b9c75927cd56281417843a318e85c39ce729 /.gitattributes | |
| parent | 074032e0270ae70eed481a082158dc9554aaa1db (diff) | |
merge from 3.0 branch till 1531.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 5b8a157e..665367a7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2234,6 +2234,7 @@ 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/Ticket453.page -text +tests/FunctionalTests/tickets/protected/pages/Ticket463.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 @@ -2256,6 +2257,7 @@ tests/FunctionalTests/tickets/tests/Ticket27TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket284TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket285TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket28TestCase.php -text +tests/FunctionalTests/tickets/tests/Ticket463TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket54TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket72TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket93TestCase.php -text |