mark_story acd2c15690 Merge branch '1.3-misc' into 1.3-merger ... Conflicts: cake/tests/cases/libs/configure.test.php		2009-11-15 20:09:12 -05:00
..
libs	Merge branch '1.3-misc' into 1.3-merger	2009-11-15 20:09:12 -05:00
templates	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11: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 newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00