diff options
| author | godzilla80@gmx.net <> | 2010-02-14 01:22:57 +0000 |
|---|---|---|
| committer | godzilla80@gmx.net <> | 2010-02-14 01:22:57 +0000 |
| commit | 94e94e0a8566f23d16658a04c55b0bbfdd6689aa (patch) | |
| tree | 72ffad82c279080dd9320d45dda26d64ffb4626f /.gitattributes | |
| parent | 966fd66f217911d079c4bd6a87b09f4a0c5c4736 (diff) | |
Merge Branches & Trunk
/trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 868a31ba..964ffa6d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2896,6 +2896,7 @@ framework/powered2.gif -text framework/prado-cli -text framework/prado-cli.bat -text framework/prado.php -text +framework/pradolite.php -text /index.html -text /phing -text /phing.bat -text @@ -3127,6 +3128,8 @@ tests/FunctionalTests/tickets/protected/messages/en/messages.xml -text tests/FunctionalTests/tickets/protected/pages/DActiveDropDownList2.php -text tests/FunctionalTests/tickets/protected/pages/Issue120.page -text tests/FunctionalTests/tickets/protected/pages/Issue120.php -text +tests/FunctionalTests/tickets/protected/pages/Issue216.page -text +tests/FunctionalTests/tickets/protected/pages/Issue216.php -text tests/FunctionalTests/tickets/protected/pages/Layout.php -text tests/FunctionalTests/tickets/protected/pages/Layout.tpl -text tests/FunctionalTests/tickets/protected/pages/TestHtmlArea.php -text @@ -3301,6 +3304,7 @@ tests/FunctionalTests/tickets/protected700/pages/admin/users/config.xml -text tests/FunctionalTests/tickets/protected700/pages/config.xml -text tests/FunctionalTests/tickets/protected700/pages/content/Home.page -text tests/FunctionalTests/tickets/tests/Issue120TestCase.php -text +tests/FunctionalTests/tickets/tests/Issue216TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket121TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket163TestCase.php -text tests/FunctionalTests/tickets/tests/Ticket169TestCase.php -text |