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
..
elements	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
errors	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
Helper	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
layouts	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
pages	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
scaffolds	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
Helper.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30
HelperCollection.php	Making helpers load	2010-12-04 13:40:24 -04:30
MediaView.php	Moving view clasess to their new home	2010-12-04 13:31:04 -04:30
ScaffoldView.php	Moving core view to the new folder and allowing the view class to find those views	2010-12-05 13:07:01 -04:30
ThemeView.php	Moving view clasess to their new home	2010-12-04 13:31:04 -04:30
View.php	Merge remote branch 'origin/2.0' into 2.0-class-loading	2010-12-05 23:43:58 -04:30