diff options
| author | xue <> | 2006-04-16 03:54:42 +0000 |
|---|---|---|
| committer | xue <> | 2006-04-16 03:54:42 +0000 |
| commit | fc38326ea80e73717fb1d187a16421f7bc1b1b04 (patch) | |
| tree | 3af80b19880ebe572778300b10217e056eb9d2ae /.gitattributes | |
| parent | 70944795827cffd1bd5a27a9c4a99eb1434f905f (diff) | |
Merge from 3.0 branch till 918.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index 86767d26..d131ec36 100644 --- a/.gitattributes +++ b/.gitattributes @@ -268,17 +268,12 @@ demos/quickstart/protected/pages/Fundamentals/Architecture.page -text demos/quickstart/protected/pages/Fundamentals/Components.page -text demos/quickstart/protected/pages/Fundamentals/Controls.page -text demos/quickstart/protected/pages/Fundamentals/Hangman.page -text -demos/quickstart/protected/pages/Fundamentals/HelloWorld.page -text demos/quickstart/protected/pages/Fundamentals/Modules.page -text demos/quickstart/protected/pages/Fundamentals/Pages.page -text demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.page -text demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/Home.php -text demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/sequence.vsd -text demos/quickstart/protected/pages/Fundamentals/Samples/Hangman/words.txt -text -demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.page -text -demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/Home.php -text -demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.gif -text -demos/quickstart/protected/pages/Fundamentals/Samples/HelloWorld/sequence.vsd -text demos/quickstart/protected/pages/Fundamentals/Samples/config.xml -text demos/quickstart/protected/pages/Fundamentals/Services.page -text demos/quickstart/protected/pages/Fundamentals/applifecycles.gif -text @@ -291,9 +286,13 @@ demos/quickstart/protected/pages/Fundamentals/lifecycles.vsd -text demos/quickstart/protected/pages/Fundamentals/objectdiagram.gif -text demos/quickstart/protected/pages/Fundamentals/objectdiagram.vsd -text demos/quickstart/protected/pages/GettingStarted/AboutPrado.page -text +demos/quickstart/protected/pages/GettingStarted/HelloWorld.page -text demos/quickstart/protected/pages/GettingStarted/Installation.page -text demos/quickstart/protected/pages/GettingStarted/Introduction.page -text demos/quickstart/protected/pages/GettingStarted/Upgrading.page -text +demos/quickstart/protected/pages/GettingStarted/directory.gif -text +demos/quickstart/protected/pages/GettingStarted/sequence.gif -text +demos/quickstart/protected/pages/GettingStarted/sequence.vsd -text demos/quickstart/protected/pages/ViewSource.page -text demos/quickstart/protected/pages/ViewSource.php -text demos/quickstart/protected/pages/config.xml -text @@ -1074,7 +1073,6 @@ tests/FunctionalTests/quickstart/Controls/Repeater3TestCase.php -text tests/FunctionalTests/quickstart/Controls/TableTestCase.php -text tests/FunctionalTests/quickstart/Controls/TextBoxTestCase.php -text tests/FunctionalTests/quickstart/Fundamentals/HangmanTestCase.php -text -tests/FunctionalTests/quickstart/Fundamentals/HelloWorldTestCase.php -text tests/FunctionalTests/selenium/SeleneseRunner.html -text tests/FunctionalTests/selenium/SeleniumLog.html -text tests/FunctionalTests/selenium/TestRunner-splash.html -text |