cakephp2-php8/lib/Cake
José Lorenzo Rodríguez d9c99b5ef6 Merge remote branch 'origin/2.0' into 2.0-class-loading
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
2011-01-22 01:00:15 -04:30
..
Cache Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -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-02 02:00:03 -04:30
Console Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
Controller Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
Core Caching plugin objects in App::objects() 2011-01-09 00:01:44 -04:30
Error Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
I18n Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Log Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -04:30
Model Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -04:30
Network Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-02 02:00:03 -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-01-22 01:00:15 -04:30
TestSuite Merge remote branch 'origin/2.0' into 2.0-class-loading 2011-01-22 01:00:15 -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-01-22 01:00:15 -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