cakephp2-php8/cake/tests/cases
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
..
console Moving access modifier doc tag. 2009-11-14 23:38:52 +11:00
libs Merge branch '1.2' into 1.3-merger 2009-11-22 20:38:50 -05:00
basics.test.php Adding ability to provide default plugin value to pluginSplit(). 2009-11-15 19:54:33 -05:00
dispatcher.test.php Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00