mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 ... differences upon merging. Conflicts: app/config/core.php cake/console/templates/skel/config/core.php cake/libs/cache/file.php cake/libs/cake_session.php cake/libs/controller/components/email.php cake/libs/i18n.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/cache/memcache.test.php cake/tests/cases/libs/model/model_write.test.php		2010-09-24 23:27:22 -04:00
..
libs	Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0	2010-09-24 23:27:22 -04:00
templates	Updating the schema command in the core.php files to reflect the correct command needed for 1.3. Fixes #1031	2010-09-23 23:12:20 -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