mark_story e4d34b640b Merge branch '2.0-exceptions' into 2.0 ... Conflicts: cake/libs/error.php cake/tests/cases/libs/controller/scaffold.test.php cake/tests/cases/libs/error.test.php		2010-09-10 20:31:16 -04:00
..
libs	Merge branch '2.0-exceptions' into 2.0	2010-09-10 20:31:16 -04:00
templates	Changing gif to png, so baked apps have the correct icon. Fixes #1081	2010-09-06 01:39:39 -04:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Applying patch from 'Mark Mitchell' to fix auto exiting of cake.bat. Fixes #992	2010-08-14 18:54:12 -04:00
cake.php	Adding stack trace to the console error handler. Updating tests.	2010-09-08 23:38:51 -04:00
console_error_handler.php	Adding stack trace to the console error handler. Updating tests.	2010-09-08 23:38:51 -04:00