mark_story fb7d931bef Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Config/config.php lib/Cake/VERSION.txt		2011-11-15 23:10:34 -05:00
..
ClassRegistry.php	Replace complicated $$foo with simple variable.	2011-11-12 21:42:20 -05:00
Debugger.php	Merge branch '2.0' into 2.1	2011-11-03 22:04:00 -04:00
File.php	Merge branch '2.0' into 2.1	2011-11-15 23:10:34 -05:00
Folder.php	Add @link to File and Folder utilities	2011-11-14 22:40:02 -08:00
Inflector.php	Fix inflection for words ending in media.	2011-10-24 21:05:56 -04:00
ObjectCollection.php	Removed unused option triggerDisabled from ObjectCollection::trigger().	2011-11-06 20:29:46 +05:30
Sanitize.php	Fixed documentation to methods that use func_get_args().	2011-08-21 21:45:34 -04:00
Security.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Set.php	Merge branch '1.3' into 1.3-merge	2011-10-10 09:37:06 -04:00
String.php	fixing typos	2011-10-19 12:19:28 +07:00
Validation.php	Fix strict warnings on Validation class.	2011-10-19 23:18:46 -04:00
Xml.php	Changed methods and attributes from private to protected.	2011-08-20 00:43:34 -04:00