mark_story 9b08b725fe Merge branch '2.0' into 2.0-view ... Conflicts: cake/libs/controller/controller.php cake/libs/view/helpers/cache.php		2010-11-13 21:03:54 -05:00
..
libs	Turning __get() back into methods. There were so few properties being accessed that it didn't make sense to have __get(), over a handful of methods.	2010-11-12 23:57:55 -05:00
shells	Merge branch '2.0' into 2.0-view	2010-11-13 21:03:54 -05:00
templates	Removing =& operators for construction of objects.	2010-11-12 23:05:44 -05:00
cake	Changing more php version strings.	2010-10-03 12:46:03 -04:00
cake.bat	Changing more php version strings.	2010-10-03 12:46:03 -04:00
cake.php	Adding omitted return statements.	2010-10-17 22:43:06 -04:00
shell_dispatcher.php	Making the cake --help shortcut pass along the other options.	2010-10-26 22:40:11 -04:00