diff options
| author | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-13 16:09:35 +0200 |
|---|---|---|
| committer | Ciro Mattia Gonano <ciromattia@gmail.com> | 2013-09-13 16:09:35 +0200 |
| commit | 814ce698f0823270cbbd28057ed95206fd9f9a27 (patch) | |
| tree | 1f537c6be49a15760a4ef5d43ce1e1f8550b2416 /.gitignore | |
| parent | 9fbf45850cd58e7d73298da109ab95ca5424a981 (diff) | |
| parent | 84df9a33a4d7ddd24e0241c370c5d2d06add89f5 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 56 |
1 files changed, 4 insertions, 52 deletions
@@ -8,9 +8,7 @@ atlassian-ide-plugin.xml /vendor /composer.lock /.cache -buildscripts/chmbuilder/assets/* buildscripts/chmbuilder/classes/Data/classes.data -buildscripts/chmbuilder/classes/runtime/* buildscripts/classtree/Configuration buildscripts/classtree/PRADO.mxi buildscripts/texbuilder/quickstart/*.aux @@ -19,61 +17,12 @@ buildscripts/texbuilder/quickstart/*.tex buildscripts/texbuilder/quickstart/quickstart.log buildscripts/texbuilder/quickstart/quickstart.out buildscripts/texbuilder/quickstart/quickstart.toc -demos/address-book/assets/* -demos/address-book/protected/runtime/* -demos/blog-tutorial/assets/* -demos/blog-tutorial/protected/runtime/* -demos/blog-tutorial/samples/day1/blog/assets/* -demos/blog-tutorial/samples/day1/blog/protected/runtime/* -demos/blog-tutorial/samples/day2/blog/assets/* -demos/blog-tutorial/samples/day2/blog/protected/runtime/* -demos/blog-tutorial/samples/day3/blog/assets/* -demos/blog-tutorial/samples/day3/blog/protected/runtime/* -demos/blog-tutorial/samples/day4/blog/assets/* -demos/blog-tutorial/samples/day4/blog/protected/runtime/* -demos/blog-tutorial/samples/day5/blog/assets/* -demos/blog-tutorial/samples/day5/blog/protected/runtime/* -demos/blog/assets/* -demos/blog/protected/runtime/* -demos/chat/assets/* -demos/chat/protected/runtime/* -demos/composer/assets/* -demos/composer/protected/runtime/* -demos/currency-converter/assets/* -demos/currency-converter/protected/runtime/* -demos/helloworld/assets/* -demos/helloworld/protected/runtime/* -demos/northwind-db/assets/* -demos/northwind-db/protected/runtime/* -demos/personal/assets/* -demos/personal/protected/runtime/* demos/quickstart/.cache demos/quickstart/.project demos/quickstart/.settings -demos/quickstart/assets/* demos/quickstart/index_pl.php -demos/quickstart/protected/runtime/* -demos/soap/assets/* -demos/soap/protected/runtime/* -demos/sqlmap/assets/* -demos/sqlmap/protected/runtime/* -demos/time-tracker/assets/* -demos/time-tracker/protected/runtime/* -tests/FunctionalTests/active-controls/assets/* -tests/FunctionalTests/active-controls/protected/runtime/* -tests/FunctionalTests/features/assets/* -tests/FunctionalTests/features/protected/runtime/* tests/FunctionalTests/results.dat -tests/FunctionalTests/tickets/assets/* -tests/FunctionalTests/tickets/protected/runtime/* -tests/FunctionalTests/tickets/protected700/runtime/* -tests/FunctionalTests/validators/assets/* -tests/FunctionalTests/validators/protected/runtime/* -tests/simple_unit/runtime/* -tests/unit/Caching/mockapp/runtime/* tests/unit/Data/db/test.db -tests/unit/Security/app/runtime/* -tests/unit/Web/app/runtime/* # Composer stuff vendor/* @@ -81,4 +30,7 @@ bin/phpunit bin/phing bin/apigen.php bin/coveralls -bin/dbunit.php
\ No newline at end of file +bin/dbunit.php + +#OSX +.DS_Store
\ No newline at end of file |