Jose Lorenzo Rodriguez febf28f34b Merge remote-tracking branch 'origin/1.3' into 2.0 ... Conflicts: cake/console/templates/default/views/home.ctp cake/libs/controller/controller.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/view/media.test.php cake/tests/lib/cake_test_case.php cake/tests/lib/code_coverage_manager.php cake/tests/test_app/views/pages/home.ctp lib/Cake/Cache/Engine/ApcEngine.php lib/Cake/Model/Datasource/Database/Mysql.php lib/Cake/View/Helper/FormHelper.php		2011-07-25 14:44:23 -04:30
..
Command	Adding option to ProjectTask, for setting CAKE_CORE_INCLUDE_PATH. Tests added.	2011-07-13 23:54:24 +02:00
Templates	Merge remote-tracking branch 'origin/1.3' into 2.0	2011-07-25 14:44:23 -04:30
AppShell.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
cake	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
cake.bat	Merge branch '1.3' into merger	2011-06-23 12:48:06 -07:00
cake.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleErrorHandler.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleInput.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleInputArgument.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleInputOption.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleInputSubcommand.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleOptionParser.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
ConsoleOutput.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
HelpFormatter.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00
Shell.php	Actually checking that files exist before saying they do.	2011-06-21 10:45:01 -07:00
ShellDispatcher.php	Camelized templates folder.	2011-05-30 23:02:39 -04:00
TaskCollection.php	Updating the copyright to 2011.	2011-05-30 22:32:43 -04:00