Mark Story 09ad7418f5 Merge remote branch 'origin/1.2' into merger ... Conflicts: cake/console/templates/skel/config/inflections.php cake/libs/model/cake_schema.php cake/libs/model/model.php		2010-01-15 11:51:58 -05:00
..
behaviors	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
datasources	Fixing doc block	2010-01-11 15:34:16 -04:30
cake_schema.test.php	Merge branch '1.3-misc' into 1.3-merger	2009-11-15 20:09:12 -05:00
connection_manager.test.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
db_acl.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
model.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
model_behavior.test.php	Standardising docblock endings throughout.	2009-11-14 23:19:25 +11:00
model_delete.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
model_integration.test.php	Refactoring Model::exists() to be independent of Model::$useTable. Fixes #199.	2010-01-14 16:47:08 -05:00
model_read.test.php	Fixing php4 compatibility in model_read test.	2010-01-14 23:38:24 -05:00
model_validation.test.php	Merge remote branch 'origin/1.2' into merger	2010-01-15 11:51:58 -05:00
model_write.test.php	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
models.php	Merge remote branch 'origin/1.2' into merger	2010-01-15 11:51:58 -05:00