cakephp2-php8/cake/libs/model
mark_story 443f6d1c5b Merge branch '1.3' into merger
Conflicts:
	cake/console/shells/tasks/test.php
	cake/libs/cake_log.php
	cake/libs/controller/components/email.php
	cake/libs/set.php
	cake/libs/view/helpers/cache.php
	cake/libs/view/helpers/paginator.php
	cake/libs/view/helpers/time.php
	cake/libs/view/view.php
	cake/tests/cases/console/libs/tasks/fixture.test.php
	cake/tests/cases/console/shells/tasks/test.test.php
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/db_acl.test.php
	cake/tests/cases/libs/set.test.php
2011-01-08 23:49:19 -05:00
..
behaviors Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
datasources Merge branch '1.3' into merger 2011-01-08 23:49:19 -05:00
app_model.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
behavior_collection.php Adding documentation. 2010-12-26 17:21:49 -05:00
cake_schema.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
connection_manager.php Fixing issue in console when baking a new project, from outside the 2010-12-27 00:19:59 -05:00
db_acl.php Removing @subpackage tags, moving contents of @subpackage into @package. 2010-12-24 14:09:57 -05:00
model.php Adding Model::hasMethod() and tests. 2010-12-26 17:35:22 -05:00
model_behavior.php Adding documentation. 2010-12-26 17:21:49 -05:00