mark_story 326424592d Merge branch '1.2' into 1.2-merger ... Conflicts: cake/VERSION.txt cake/config/config.php cake/dispatcher.php cake/libs/controller/scaffold.php cake/libs/inflector.php cake/libs/view/view.php cake/tests/cases/libs/controller/scaffold.test.php cake/tests/cases/libs/inflector.test.php cake/tests/cases/libs/view/view.test.php cake/tests/fixtures/counter_cache_post_fixture.php cake/tests/fixtures/counter_cache_user_fixture.php		2009-09-13 13:52:58 -04:00
..
elements	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
errors	Adding error methods and templates for Missing Behavior class and Missing Behavior File errors.	2009-08-26 10:02:55 -04:00
helpers	Merge branch '1.2' into 1.2-merger	2009-09-13 13:52:58 -04:00
layouts	Merge branch '1.3' into 1.3-newlines	2009-07-25 10:41:40 -07:00
pages	Merge branch '1.3-misc' into 1.3	2009-08-02 12:20:07 -07:00
scaffolds	Merge branch '1.2' into 1.3	2009-07-30 11:34:33 -07:00
helper.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
media.php	adding a newline before all comment blocks	2009-07-24 21:18:37 +02:00
theme.php	Additional documentation.	2009-08-24 22:57:01 -04:00
view.php	Minor refactor to remove method calls to Inflector::camelize.	2009-09-03 09:37:25 -04:00