cakephp2-php8/lib/Cake
José Lorenzo Rodríguez 6e4f4efb79 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/bootstrap.php
	lib/Cake/Console/Command/TestSuiteShell.php
	lib/Cake/Console/TaskCollection.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/App.php
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/Network/CakeRequest.php
	lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
	lib/Cake/TestSuite/CakeWebTestCase.php
	lib/Cake/TestSuite/TestManager.php
	lib/Cake/TestSuite/TestRunner.php
	lib/Cake/View/HelperCollection.php
	lib/Cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
	lib/Cake/tests/cases/libs/test_manager.test.php
2011-02-13 23:10:19 -04:30
..
Cache Fixing Cache tests 2011-01-31 00:47:30 -04:30
config Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Configure Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-28 01:14:59 -04:30
Console Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Controller Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Core Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Error Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
I18n Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Log Extracting CakeLogInterface to its own file, this fixes the FileLog test case 2011-01-28 01:52:54 -04:30
Model Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Network Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Routing Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
tests Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
TestSuite Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
Utility Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
View Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-02-13 23:10:19 -04:30
basics.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
bootstrap.php Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30