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
..
behaviors	Merge remote branch 'origin/1.3' into 2.0	2010-04-06 12:19:34 +10:00
datasources	Merge remote branch 'origin/1.3' into 2.0	2010-04-06 12:19:34 +10:00
cake_schema.test.php	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
connection_manager.test.php	Fixing missing reference operators in test cases.	2010-03-05 22:06:20 -05:00
db_acl.test.php	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
model.test.php	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
model_behavior.test.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00
model_delete.test.php	Type casting conditions array to avoid warning during array merge in Model::_deleteDependent(). Fixes #477	2010-03-18 02:51:55 +05:30
model_integration.test.php	Merge remote branch 'origin/1.2' into 1.3	2010-03-27 11:48:49 -04:00
model_read.test.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00
model_validation.test.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
model_write.test.php	Changed all public methods to specify public access.	2010-04-05 13:19:38 +10:00
models.php	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00