mark_story b9f0fc0724 Merge branch '1.3' into merger ... Conflicts: cake/dispatcher.php cake/libs/cake_session.php cake/libs/controller/components/cookie.php cake/libs/controller/components/email.php cake/libs/controller/controller.php cake/libs/controller/scaffold.php cake/libs/set.php cake/libs/validation.php cake/libs/view/view.php cake/tests/cases/dispatcher.test.php cake/tests/cases/libs/controller/components/security.test.php cake/tests/cases/libs/controller/controller.test.php cake/tests/cases/libs/validation.test.php cake/tests/cases/libs/view/view.test.php		2010-12-10 22:24:31 -05:00
..
app_helper.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00
cache.php	Adding cache comment stripping to the CacheHelper, it was recently removed from View, and needed to be added here to fix failing tests.	2010-11-09 23:55:30 -05:00
form.php	Merge branch '1.3' into merger	2010-12-10 22:24:31 -05:00
html.php	Merge branch '1.3' into merger	2010-12-10 22:24:31 -05:00
jquery_engine.php	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
js.php	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
mootools_engine.php	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
number.php	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00
paginator.php	Merge branch '2.0' into 2.0-view	2010-11-10 23:41:44 -05:00
prototype_engine.php	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
rss.php	Fixing issues with RssHelper and updating tests to reflect changes in how Xml::build() differs from previous versions' Xml.	2010-10-23 13:11:50 -04:00
session.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00
text.php	Changing more php version strings.	2010-10-03 12:46:03 -04:00
time.php	Replaced the *printf with i18n aliases by i18n aliases with params.	2010-12-04 23:37:13 -02:00