predominant 6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0 ... Conflicts: cake/basics.php cake/console/libs/shell.php cake/console/libs/tasks/controller.php cake/libs/controller/components/request_handler.php cake/libs/model/model.php cake/libs/model/model_behavior.php cake/libs/overloadable.php cake/libs/overloadable_php4.php cake/libs/overloadable_php5.php cake/libs/sanitize.php cake/libs/validation.php cake/libs/view/helpers/ajax.php cake/libs/view/helpers/javascript.php cake/libs/view/pages/home.ctp cake/tests/cases/console/libs/tasks/controller.test.php cake/tests/cases/libs/overloadable.test.php cake/tests/cases/libs/validation.test.php cake/tests/cases/libs/view/helpers/ajax.test.php cake/tests/cases/libs/view/helpers/javascript.test.php cake/tests/test_app/libs/cache/test_app_cache.php cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php		2010-05-20 12:22:04 +10:00
..
config	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
controllers	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00
libs	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00
locale	LC_TIME support multi-byte value.	2010-03-02 23:51:22 -04:30
models	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
plugins	Merge remote branch 'origin/1.3' into 2.0	2010-05-20 12:22:04 +10:00
tmp	updating file engine and test case	2008-06-24 01:09:54 +00:00
vendors	Update various links. Closes #392	2010-05-18 22:15:13 -03:00
views	Removing closing PHP tags.	2010-05-11 08:27:28 +10:00
webroot/theme/test_theme	Adding more tests for theme assets	2009-11-27 10:27:15 -06:00