cakephp2-php8/cake/libs/controller
mark_story 3ea8c2246a Merge branch '1.3' into merger
Conflicts:
	cake/console/cake.php
	cake/dispatcher.php
	cake/libs/controller/components/cookie.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/ajax.php
	cake/tests/cases/dispatcher.test.php
	cake/tests/cases/libs/model/model_validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/lib/cake_test_fixture.php
2011-03-01 22:21:44 -05:00
..
components Merge branch '1.3' into merger 2011-03-01 22:21:44 -05:00
app_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
cake_error_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
component.php Fix to resolve 'assign by reference' errors when using a '__get' magic method. 2011-01-21 15:52:03 -05:00
component_collection.php Removing a pointless import in CakeRequest. 2011-02-05 01:28:41 -05:00
controller.php Merge branch '2.0-auth' into 2.0 2011-02-14 22:45:39 -05:00
pages_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
scaffold.php Fixing viewClass name on Scaffold. 2011-02-19 22:21:58 -05:00