mark_story c9bd97309f Merge branch '1.3' into merger ... Conflicts: cake/libs/configure.php cake/libs/controller/components/email.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/pages/home.ctp cake/tests/cases/libs/controller/components/email.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php lib/Cake/Config/config.php lib/Cake/Console/Command/Task/ViewTask.php lib/Cake/Model/Datasource/DboSource.php lib/Cake/Model/Model.php lib/Cake/Test/Case/Model/ModelReadTest.php lib/Cake/Test/Case/Model/ModelValidationTest.php lib/Cake/Test/Case/Utility/InflectorTest.php lib/Cake/Test/Case/View/Helper/FormHelperTest.php lib/Cake/Utility/Inflector.php lib/Cake/Utility/Validation.php lib/Cake/VERSION.txt lib/Cake/View/Helper.php lib/Cake/View/Helper/FormHelper.php		2011-10-01 22:38:20 -04:00
..
Component	Merge branch '1.3' into merger	2011-10-01 22:38:20 -04:00
ComponentCollectionTest.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
ComponentTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ControllerMergeVarsTest.php	Changed the visibility to methods that not affect others classes.	2011-08-20 01:39:30 -04:00
ControllerTest.php	Removing bad integration test that wasn't required anymore.	2011-09-01 00:23:59 +01:00
PagesControllerTest.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
ScaffoldTest.php	Splitting apart the Scaffold and ScaffoldView tests.	2011-09-16 22:08:19 -04:00