mark_story a3bb77c4f3 Merge branch '1.2' into 1.3-merger ... Conflicts: cake/console/libs/acl.php cake/console/libs/tasks/controller.php cake/console/libs/tasks/db_config.php cake/console/libs/tasks/model.php cake/console/libs/templates/skel/views/layouts/xml/default.ctp cake/libs/model/datasources/dbo/dbo_mysql.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/validation.php cake/libs/view/helpers/form.php cake/tests/cases/basics.test.php cake/tests/cases/console/libs/tasks/model.test.php cake/tests/cases/libs/cake_test_case.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php cake/tests/cases/libs/view/helpers/javascript.test.php cake/tests/cases/libs/view/helpers/session.test.php cake/tests/groups/controller.group.php cake/tests/groups/lib.group.php cake/tests/groups/no_database.group.php		2009-11-01 12:11:49 -05:00
..
libs	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
templates	Fixing escape parameter usage.	2009-10-28 18:41:29 -04: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	Adding return to Shell::out() and ShellDispatcher::stdout(). They now return the number of bytes written to stdout. Fixes #164	2009-10-15 00:23:54 -04:00
error.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00