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
..
libs	Fixing php4 issues for AclShell test case.	2010-01-14 22:15:14 -05:00
templates	Merge remote branch 'origin/1.2' into merger	2010-01-15 11:51:58 -05:00
cake	Removing more @filesource lines.	2009-11-06 18:12:27 +11:00
cake.bat	Removing more @filesource lines.	2009-11-06 18:12:27 +11:00
cake.php	Replacing duplicated code with pluginSplit().	2009-11-15 19:55:20 -05:00
error.php	Removing "Long description for file" from /cake/console tree.	2009-12-08 20:18:19 +11:00