mark_story 6a4e7558fc Merge branch '1.3' into merger ... Conflicts: cake/basics.php cake/console/libs/tasks/extract.php cake/libs/view/helpers/js.php cake/tests/cases/console/libs/tasks/extract.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php cake/tests/test_app/views/pages/extract.ctp lib/Cake/Cache/Engine/MemcacheEngine.php lib/Cake/Model/Behavior/ContainableBehavior.php lib/Cake/Model/Datasource/Database/Mysql.php lib/Cake/Model/Datasource/DboSource.php lib/Cake/Model/Model.php lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php lib/Cake/Test/Case/Model/CakeSchemaTest.php lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php lib/Cake/Test/Case/View/Helper/FormHelperTest.php lib/Cake/Test/Case/View/Helper/TimeHelperTest.php		2011-09-18 12:09:04 -04:00
..
Behavior	Merge branch '1.3' into merger	2011-09-18 12:09:04 -04:00
Datasource	Merge branch '1.3' into merger	2011-09-18 12:09:04 -04:00
AclNode.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
Aco.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
AcoAction.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
AppModel.php	Updating all @package annotations in doc blocks	2011-07-26 01:46:14 -04:30
Aro.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
BehaviorCollection.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00
CakeSchema.php	Fixed bug in CakeSchema where it determines the field position.	2011-09-16 15:28:28 +02:00
ConnectionManager.php	Changed methods and attributes from private to protected.	2011-08-20 00:43:34 -04:00
Model.php	Merge branch '1.3' into merger	2011-09-18 12:09:04 -04:00
ModelBehavior.php	Added visibility in some methods and attributes.	2011-08-18 22:30:28 -04:00
Permission.php	Removed the @access and @static.	2011-07-30 20:56:48 -04:00