cakephp2-php8/lib/Cake
José Lorenzo Rodríguez 07e43bb0f8 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/libs/view/scaffolds/edit.ctp
	cake/libs/view/scaffolds/form.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.form.ctp
	cake/tests/test_app/views/posts/scaffold.edit.ctp
	cake/tests/test_app/views/posts/scaffold.form.ctp
	lib/Cake/Error/ErrorHandler.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Routing/Router.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/View/scaffolds/edit.ctp
	lib/Cake/tests/cases/console/shells/bake.test.php
	lib/Cake/tests/cases/libs/cake_log.test.php
	lib/Cake/tests/cases/libs/cake_request.test.php
	lib/Cake/tests/cases/libs/view/helpers/number.test.php
	lib/Cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
	lib/Cake/tests/test_app/views/posts/scaffold.edit.ctp
2010-12-15 01:13:05 -04:30
..
Cache Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
config Making shells run again 2010-12-07 01:26:10 -04:30
Configure Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Console Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Controller Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Core Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Error Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
I18n Replacing some of the App::import by App::uses 2010-12-08 23:15:18 -04:30
Log Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Model Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Network Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Routing Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
tests Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
TestSuite Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
Utility Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
View Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
basics.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2010-12-15 01:13:05 -04:30
bootstrap.php Fixing several errors when running the testsuite 2010-12-11 01:17:55 -04:30