AD7six 39c7d03319 Merge branch '2.0-class-loading' into 2.0-translations ... Conflicts: lib/Cake/Console/Command/Task/ControllerTask.php lib/Cake/Console/Command/Task/ProjectTask.php lib/Cake/Core/Configure.php lib/Cake/View/pages/home.ctp		2011-03-16 12:29:39 +01:00
..
Cache	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
config	Merge remote branch 'origin/2.0' into 2.0-class-loading	2011-01-02 02:00:03 -04:30
Configure	translations changes in the Configure folder	2011-03-12 19:50:52 +01:00
Console	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
Controller	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
Core	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
Error	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
I18n	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-03-01 23:04:52 -04:30
Log	translation changes in the log dir	2011-03-12 20:00:55 +01:00
Model	translation changes in the model dir	2011-03-12 20:01:12 +01:00
Network	translation changes in the Network dir	2011-03-12 20:01:38 +01:00
Routing	translation changes in the Routing dir	2011-03-12 20:01:53 +01:00
tests	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
TestSuite	translation changes in the TestSuite dir	2011-03-12 20:02:18 +01:00
Utility	translation changes for the Utility dir	2011-03-12 20:02:37 +01:00
View	Merge branch '2.0-class-loading' into 2.0-translations	2011-03-16 12:29:39 +01:00
basics.php	Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading	2011-02-27 22:50:53 -04:30
bootstrap.php	Properly testing the App::build() method and bugfixing some issues	2011-03-09 22:11:13 -04:30
LICENSE.txt	move readme and license to libs dimove readme and license to libs dirr	2011-03-12 20:10:58 +01:00
VERSION.txt	move readme and license to libs dimove readme and license to libs dirr	2011-03-12 20:10:58 +01:00