cakephp2-php8/cake/libs/controller
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
..
components Merge branch '1.3' into 2.0 2010-05-02 17:53:42 -04:00
app_controller.php Adding/Updating @link tags pointing to cookbook sections 2010-04-08 22:46:05 -04:00
component.php Changing protected methods to specify protected access. 2010-04-05 13:21:28 +10:00
controller.php Merge branch '1.3' into 2.0 2010-05-02 17:53:42 -04:00
pages_controller.php Merge remote branch 'origin/1.3' into 2.0 2010-04-09 22:05:00 +10:00
scaffold.php Merge branch '1.3' into 2.0 2010-05-02 17:53:42 -04:00