predominant e4d292bfa4 Merge remote branch 'origin/1.3' into 2.0 ... Conflicts: cake/console/libs/shell.php cake/libs/controller/components/acl.php cake/libs/controller/components/auth.php cake/libs/controller/components/email.php cake/libs/controller/components/security.php cake/libs/controller/components/session.php cake/libs/view/helper.php cake/libs/view/helpers/form.php cake/libs/view/helpers/html.php cake/libs/view/helpers/number.php cake/libs/view/helpers/session.php cake/libs/view/helpers/text.php cake/libs/view/helpers/time.php cake/libs/view/helpers/xml.php		2010-04-06 12:19:34 +10:00
..
libs	Merge remote branch 'origin/1.3' into 2.0	2010-04-06 12:19:34 +10:00
templates	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
cake	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.bat	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
cake.php	Changing protected methods to specify protected access.	2010-04-05 13:21:28 +10:00
error.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00