cakephp2-php8/cake/libs/controller
mark_story ee3017599d Merge branch '2.0' into 2.0-pagination
Conflicts:
	cake/libs/controller/components/paginator.php
	cake/libs/router.php
2010-12-24 14:43:11 -05:00
..
components Merge branch '2.0' into 2.0-pagination 2010-12-24 14:43:11 -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 Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
component_collection.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
pages_controller.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
scaffold.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00