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
..
cases	Merge remote branch 'origin/1.2' into merger	2010-01-15 11:51:58 -05:00
fixtures	Removing "Long description for file" from /cake/tests tree.	2009-12-08 20:19:42 +11:00
groups	Updating lib group with omitted classes.	2009-12-19 20:32:34 -05:00
lib	Updating CakeTestSuiteDispatcher parsing of .	2010-01-13 23:19:10 -05:00
test_app	Updating helper syntax.	2010-01-14 23:07:15 -05:00