predominant 52cdef900b Merge remote branch 'origin/1.3' into 2.0 ... Conflicts: cake/dispatcher.php cake/libs/model/behaviors/acl.php cake/libs/model/behaviors/containable.php cake/libs/model/behaviors/tree.php cake/libs/router.php cake/tests/cases/libs/validation.test.php		2010-04-09 22:05:00 +10:00
..
elements	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
errors	Changed all public 'var' declarations to be 'public $var'	2010-04-04 17:14:00 +10:00
helpers	Merge remote branch 'origin/1.3' into 2.0	2010-04-09 22:05:00 +10:00
layouts	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
pages	Updating version numbers to 1.3.0-RC3	2010-03-28 19:13:49 -04:00
scaffolds	Merge branch '1.2' into 1.3-merger	2010-01-26 17:54:34 -05:00
helper.php	Merge remote branch 'origin/1.3' into 2.0	2010-04-09 22:05:00 +10:00
media.php	Changing protected methods to specify protected access.	2010-04-05 13:21:28 +10:00
theme.php	Fixing memory leak in ThemeView where __paths would grow each time _paths() was called. Fixes #329	2010-02-11 22:57:24 -05:00
view.php	Adjust view __scripts to be a protected instance variable, and add test methods for View addScript tests.	2010-04-05 21:15:17 +10:00