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
..
css	Update license lines throughout.	2009-11-06 17:51:51 +11:00
img	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
js	Removing webroot/js/vendors.php. These files are no longer needed as Dispatcher can handle serving js files from vendors directories. Adding empty files to empty directories. Refs #50	2009-09-13 23:32:27 -04:00
.htaccess	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
css.php	Merge branch '1.2' into 1.3-merger	2009-11-22 20:38:50 -05:00
favicon.ico	Moving shell templates dirs.	2009-07-26 01:29:08 -04:00
index.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
test.php	Merge branch '1.2' into 1.3-merger	2009-11-22 20:38:50 -05:00