mark_story 7259a1b920 Merge branch '1.2' into 1.2-merger ... Conflicts: cake/libs/model/datasources/dbo/dbo_mysql.php cake/libs/model/datasources/dbo/dbo_mysqli.php cake/libs/view/helpers/text.php cake/libs/view/theme.php		2009-12-06 21:43:53 -05:00
..
css	Merge branch '1.2' into 1.2-merger	2009-12-06 21:43:53 -05:00
files	Adding empty files to directories that were previously omitted.	2009-09-20 18:03:42 -04:00
img	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00: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	Merging fixes and enhancements into trunk	2006-01-20 07:46:14 +00:00
css.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
favicon.ico	updating images/icons with optimized versions. thanks mjc	2008-06-02 04:30:14 +00:00
index.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
test.php	Fixing links throughout	2009-11-06 17:46:59 +11:00