Mark Story adf604a966 Merge branch '1.3' into 2.0 ... Conflicts: cake/console/templates/default/actions/controller_actions.ctp cake/console/templates/default/views/form.ctp cake/console/templates/default/views/index.ctp cake/console/templates/default/views/view.ctp cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/view/pages/home.ctp cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/model/cake_schema.test.php		2010-05-02 17:53:42 -04:00
..
config	Merge remote branch 'origin/1.3' into 2.0	2010-04-23 12:52:56 +10:00
controllers	Merge remote branch 'origin/1.3' into 2.0	2010-04-23 12:52:56 +10:00
libs	Adding libs to templates/skel so baked projects contain an app/libs dir.	2009-11-17 10:27:09 -05:00
locale/eng/LC_MESSAGES	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
models	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
plugins	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
tests	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
tmp	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
vendors/shells/tasks	Removing vendors/img, vendors/css and vendors/js from skel dirs.	2009-11-25 22:51:33 -05:00
views	Change Cake Console files to new use of shortcut for translations.	2010-04-16 01:43:39 +10:00
webroot	Merge branch '1.3' into 2.0	2010-05-02 17:53:42 -04:00
.htaccess	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
app_controller.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
app_helper.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
app_model.php	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
index.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00