cakephp2-php8/lib/Cake/Model
mark_story 6d269ce25d Merge branch '2.0' into 2.1
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
2011-12-03 13:45:28 -05:00
..
Behavior Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
Datasource Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
AclNode.php Dropping short syntax support for Behavior configuration. 2011-10-15 20:52:41 +02:00
Aco.php Fixing some @package declarations 2011-09-30 13:17:12 -04:30
AcoAction.php Fixing some @package declarations 2011-09-30 13:17:12 -04:30
Aro.php Removed the @access and @static. 2011-07-30 20:56:48 -04:00
BehaviorCollection.php Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
CakeSchema.php Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
ConnectionManager.php Using plugin name on exception thrown and in templates files. 2011-10-16 13:40:36 +02:00
Model.php Merge branch '2.0' into 2.1 2011-12-03 13:45:28 -05:00
ModelBehavior.php fixing typos 2011-10-19 12:19:28 +07:00
Permission.php Fixing some @package declarations 2011-09-30 13:17:12 -04:30