Mark Story 59c6b419e5 Merge branch '1.3' into merger ... Conflicts: cake/console/libs/bake.php cake/libs/configure.php cake/libs/controller/components/request_handler.php cake/tests/cases/console/libs/tasks/fixture.test.php cake/tests/cases/libs/controller/components/request_handler.test.php lib/Cake/Cache/Engine/FileEngine.php lib/Cake/Test/Case/Controller/ScaffoldTest.php lib/Cake/Utility/Validation.php		2011-08-28 22:08:49 -04:00
..
ClassRegistryTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
DebuggerTest.php	Merge branch '2.0-api-doc' into 2.0	2011-08-26 20:22:26 -04:00
FileTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
FolderTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
InflectorTest.php	Merge branch '1.3' into merger	2011-08-28 22:08:49 -04:00
ObjectCollectionTest.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
SanitizeTest.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
SecurityTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
SetTest.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
StringTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ValidationTest.php	Merge branch '1.3' into merger	2011-08-28 22:08:49 -04:00
XmlTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00