mark_story 21cd3f00ac Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Test/Case/BasicsTest.php		2011-11-19 20:40:07 -05:00
..
Config	Add back missing .sql files, related to pull request 132 on docs repo	2011-11-17 13:00:54 +01:00
Console	removing 'empty' files from nonempty directories	2011-10-19 12:19:28 +07:00
Controller	Syncing files between app directory and bake skeleton	2011-11-14 02:32:59 +05:30
Lib	Partial migration of folders to camelcase in app	2011-03-22 00:46:51 -04:30
Locale/eng/LC_MESSAGES	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Model	Syncing files between app directory and bake skeleton	2011-11-14 02:32:59 +05:30
Plugin	Starting unification of casing in remaining folders	2011-05-13 01:53:49 -04:30
Test	removing 'empty' files from nonempty directories	2011-10-19 12:19:28 +07:00
tmp	fix file permissions	2011-03-16 16:06:44 +01:00
Vendor	Adding missing Vendor directory.	2011-07-28 16:31:19 -04:00
View	Merge branch '2.1' of github.com:cakephp/cakephp into 2.1	2011-11-15 23:11:07 -05:00
webroot	Merge branch '2.0' into 2.1	2011-11-03 22:04:00 -04:00
.htaccess	Merging fixes and enhancements into trunk	2006-02-18 23:42:21 +00:00
index.php	Updating the copyright to 2011.	2011-05-30 22:46:14 -04:00