cakephp2-php8/cake/tests/test_app
mark_story 4d37e75f18 Merge branch '1.2' into 1.3-merger
Conflicts:
	cake/console/libs/tasks/controller.php
	cake/console/libs/tasks/extract.php
	cake/console/libs/tasks/model.php
	cake/libs/configure.php
	cake/libs/controller/components/cookie.php
	cake/libs/debugger.php
	cake/libs/flay.php
	cake/libs/http_socket.php
	cake/libs/inflector.php
	cake/libs/model/cake_schema.php
	cake/libs/model/connection_manager.php
	cake/libs/model/datasources/dbo/dbo_mysql.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/router.php
	cake/libs/view/helper.php
	cake/libs/view/helpers/form.php
	cake/libs/view/helpers/html.php
	cake/libs/view/helpers/js.php
2009-11-22 20:38:50 -05:00
..
config Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
controllers Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
libs Adding file headers. 2009-11-14 20:25:45 -05:00
locale fixes #6455, i18n locale message category bug 2009-07-03 15:54:26 +00:00
models Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
plugins Adding file headers to config files in test app. 2009-11-15 18:09:04 -05:00
tmp updating file engine and test case 2008-06-24 01:09:54 +00:00
vendors Removing newline caused by Subversion line removal. 2009-11-06 18:01:22 +11:00
views Removing leftover SVN tags. 2009-11-06 18:35:14 +11:00