Jose Lorenzo Rodriguez 000e05b468 Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading ... Conflicts: cake/libs/view/helpers/js.php cake/tests/lib/templates/missing_conenction.php cake/tests/lib/templates/missing_connection.php lib/Cake/Model/ConnectionManager.php lib/Cake/TestSuite/templates/missing_conenction.php lib/Cake/View/Helper/FormHelper.php lib/Cake/tests/Case/Core/ConfigureTest.php		2011-04-11 22:48:08 -04:30
..
ClassRegistry.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-04-11 22:48:08 -04:30
Debugger.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
File.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Folder.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Inflector.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-04-11 22:48:08 -04:30
ObjectCollection.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Sanitize.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-04-11 22:48:08 -04:30
Security.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Set.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-22 01:00:15 -04:30
String.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Validation.php	consolidate cake_error and cake_developer to simply "cake_dev"	2011-03-20 16:38:31 +01:00
Xml.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-04-11 22:48:08 -04:30