mark_story df5d9ac3d1 Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Model/Model.php lib/Cake/Test/Case/Routing/RouterTest.php		2012-01-20 20:28:15 -05:00
..
ClassRegistry.php	Ensure the class has a constructor	2012-01-09 23:42:09 +01:00
Debugger.php	Wrapping highlight_string into a helper function as hphp does not implemnet this function	2012-01-07 19:10:44 -04:30
File.php	Merge branch '2.0' into 2.1	2011-12-22 03:15:04 +05:30
Folder.php	Removed constant available only in php 5.3 and changed exception type to fix errors on php 5.2. Fixes #2487	2012-01-20 04:05:40 +05:30
Inflector.php	Fix singularization of 'foes'	2012-01-05 21:22:40 -05:00
ObjectCollection.php	Fix strict errors.	2011-12-29 11:10:25 -05:00
Sanitize.php	Add missing else for non SQLServer db's.	2012-01-06 23:06:12 -05:00
Security.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Set.php	allow specifying an explicit root	2012-01-18 13:05:44 +01:00
String.php	Adding a replacement for zend_thread_id() to use within hiphop	2012-01-07 18:41:16 -04:30
Validation.php	added sftp to url()	2012-01-19 22:05:10 -05:00
Xml.php	Merge branch '2.0' into 2.1	2011-12-11 22:51:40 -05:00