Juan Basso 620a65b2fc Merge branch '2.0' into 2.0-api-doc ... Conflicts: lib/Cake/Test/Case/View/Helper/CacheHelperTest.php lib/Cake/Utility/Debugger.php		2011-08-14 21:12:05 -04:00
..
ClassRegistry.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
Debugger.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
File.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
Folder.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
Inflector.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ObjectCollection.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
Sanitize.php	Merge branch '1.3' into merger	2011-08-14 14:39:49 -04:00
Security.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Set.php	Merge branch '2.0' into 2.0-api-doc	2011-08-14 21:12:05 -04:00
String.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Validation.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
Xml.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00