José Lorenzo Rodríguez 3f64844de9 Merge remote branch 'origin/2.0' into 2.0-class-loading ... Conflicts: lib/Cake/Model/ConnectionManager.php lib/Cake/basics.php		2010-12-05 23:43:58 -04:30
..
error400.ctp	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
error500.ctp	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
missing_action.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_behavior_class.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_behavior_file.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_component_class.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_component_file.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_connection.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_controller.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_database.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_helper_class.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_helper_file.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_layout.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_table.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
missing_view.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
private_action.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
scaffold_error.ctp	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30