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
..
acl.php	Adding patch from 'Ceeram' and 'TehTreag' to implement automatic updating of Aro/Aco nodes created AclBehavior. Test cases added. Fixes #33 and #4261	2009-09-19 01:17:20 -04:00
containable.php	Merge commit 'origin/1.2' into 1.2-merge-in	2009-10-14 00:51:55 -04:00
translate.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
tree.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00