cakephp2-php8/cake/libs/model
mark_story f21161ef46 Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0
differences upon merging.

Conflicts:
	app/config/core.php
	cake/console/templates/skel/config/core.php
	cake/libs/cache/file.php
	cake/libs/cake_session.php
	cake/libs/controller/components/email.php
	cake/libs/i18n.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/model/model_write.test.php
2010-09-24 23:27:22 -04:00
..
behaviors Merge branch '1.3' into 2.0 2010-09-06 16:53:04 -04:00
datasources Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 2010-09-24 23:27:22 -04:00
app_model.php Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
behavior_collection.php Merge branch '2.0-exceptions' into 2.0 2010-09-10 20:31:16 -04:00
cake_schema.php Dont use private attributes as tables in CakeSchema. Fixes #7 2010-08-02 00:22:46 -03:00
connection_manager.php Merge branch '2.0-exceptions' into 2.0 2010-09-10 20:31:16 -04:00
db_acl.php Removing PHP5 and all its uses. 2010-07-05 22:19:22 -04:00
model.php Merge branch '1.3' into 2.0. Had to fix a number of 1.3 -> 2.0 2010-09-24 23:27:22 -04:00
model_behavior.php Removing ModelBehavior::dispatchMethod(), replacing with call_user_func_array() as its faster and the php4 workaround is no longer needed. 2010-08-10 23:18:39 -04:00