Mark Story 98749a5a2b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 ... Conflicts: cake/libs/folder.php		2010-01-25 11:18:44 -05:00
..
tasks	Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3	2010-01-25 11:18:44 -05:00
acl.php	Fixing php4 issues for AclShell test case.	2010-01-14 22:15:14 -05:00
api.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
bake.php	Replacing duplicated code with pluginSplit().	2009-11-15 19:55:20 -05:00
console.php	Fixing ConsoleShell's use of Router. Fixes #236	2010-01-20 10:47:04 -05:00
i18n.php	Removing "Long description for file" from /cake/console tree.	2009-12-08 20:18:19 +11:00
schema.php	Replacing duplicated code with pluginSplit().	2009-11-15 19:55:20 -05:00
shell.php	Removing "Long description for file" from /cake/console tree.	2009-12-08 20:18:19 +11:00
testsuite.php	Removing orphaned method.	2010-01-13 21:55:32 -05:00