mark_story 326424592d Merge branch '1.2' into 1.2-merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/dispatcher.php cake/libs/controller/scaffold.php cake/libs/inflector.php cake/libs/view/view.php cake/tests/cases/libs/controller/scaffold.test.php cake/tests/cases/libs/inflector.test.php cake/tests/cases/libs/view/view.test.php cake/tests/fixtures/counter_cache_post_fixture.php cake/tests/fixtures/counter_cache_user_fixture.php		2009-09-13 13:52:58 -04:00
..
libs	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
templates	Adding docblock for the new variable used for logging. Making the CakeLog::handleError logs the same output as in Debugger::handleError.	2009-09-10 12:32:21 -03:00
cake	Moving the clear command into the shell dispatcher	2009-07-24 22:01:55 +02:00
cake.bat	changing tabs for spaces in comment block indentation	2008-10-30 17:30:26 +00:00
cake.php	Revert "mend"	2009-08-12 09:46:18 -04:00
error.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00