mark_story 21cd3f00ac Merge branch '2.0' into 2.1 ... Conflicts: lib/Cake/Test/Case/BasicsTest.php		2011-11-19 20:40:07 -05:00
..
CacheHelper.php	Update generated cache files.	2011-10-31 22:27:43 -04:00
FormHelper.php	Fix issue with button() and nested name attributes.	2011-11-19 11:43:09 -05:00
HtmlHelper.php	Add missing @link to docs if available to helpers	2011-11-13 22:08:20 -08:00
JqueryEngineHelper.php	Removing trailing spaces.	2011-08-15 23:55:08 -04:00
JsBaseEngineHelper.php	Fixing strict errors.	2011-11-12 21:42:20 -05:00
JsHelper.php	Add missing @link to docs if available to helpers	2011-11-13 22:08:20 -08:00
MootoolsEngineHelper.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
NumberHelper.php	Add missing @link to docs if available to helpers	2011-11-13 22:08:20 -08:00
PaginatorHelper.php	Add missing @link to docs if available to helpers	2011-11-13 22:08:20 -08:00
PrototypeEngineHelper.php	Adjusted some types in @param, @return and @var.	2011-07-31 22:57:17 -04:00
RssHelper.php	Updating the @link's in the doc blocks for the views	2011-10-15 12:46:22 -04:30
SessionHelper.php	Add missing @link to docs if available to helpers	2011-11-13 22:08:20 -08:00
TextHelper.php	Adding escaping by default for TextHelper::autoLink()	2011-10-29 12:08:43 -04:00
TimeHelper.php	Add protected to method picked from 1.3	2011-11-19 11:37:37 -05:00