mark_story 055224ef68 Merge remote-tracking branch 'origin/1.3' into merger ... Conflicts: cake/libs/controller/controller.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/lib/cake_test_suite_dispatcher.php lib/Cake/Model/Behavior/TranslateBehavior.php lib/Cake/Model/Datasource/DataSource.php lib/Cake/Model/Datasource/Database/Mysql.php		2011-10-06 21:06:40 -04:00
..
Component	Merge remote-tracking branch 'origin/1.3' into merger	2011-10-06 21:06:40 -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