mark_story c8cf1a2c5b Updating __mergeVars to correctly merge parent and child component configurations. ... Applied patch from 'neilcrookes'. Test case added. Fixes #6325 git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8157 3807eeeb-6ff5-0310-8944-8be069107fe0		2009-04-28 01:32:20 +00:00
..
config	merging fixes to trunk. set version to 1.2.2.8120	2009-03-19 20:25:10 +00:00
console	Renaming setUp() to startTest() in Controller task. Fixes issues with fixtures and baked controller tests.	2009-04-14 23:13:43 +00:00
libs	Updating __mergeVars to correctly merge parent and child component configurations.	2009-04-28 01:32:20 +00:00
tests	Updating __mergeVars to correctly merge parent and child component configurations.	2009-04-28 01:32:20 +00:00
basics.php	Updating docblocks and including new @link tags.	2008-10-31 19:44:23 +00:00
bootstrap.php	Removed trailing whitespaces from core.	2008-11-08 02:54:07 +00:00
dispatcher.php	adding some more test for dispatcher with array urls mainly used by request action. updated docblock	2009-02-25 01:36:13 +00:00
LICENSE.txt	closes #5271, removing root docs directory. adding README	2008-12-25 18:05:56 +00:00
VERSION.txt	merging fixes to trunk. set version to 1.2.2.8120	2009-03-19 20:25:10 +00:00