Mark Story 59319b098b Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3 ... Conflicts: cake/libs/folder.php		2010-01-25 11:20:05 -05:00
..
config	Updating version numbers. to 1.3.0-beta	2010-01-16 20:38:08 -05:00
console	Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3	2010-01-25 11:18:44 -05:00
libs	Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3	2010-01-25 11:20:05 -05:00
tests	Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3	2010-01-25 11:18:44 -05:00
basics.php	small optimization in time units	2010-01-20 15:37:44 -02:00
bootstrap.php	Changing import of Dispatcher to direct require.	2009-11-07 17:53:14 -05:00
dispatcher.php	Updating and expanding documentation blocks in Dispatcher and CakeLog.	2010-01-22 18:11:49 -05:00
LICENSE.txt	Updating more Copyright dates.	2009-11-06 18:04:38 +11:00
VERSION.txt	Updating version numbers. to 1.3.0-beta	2010-01-16 20:38:08 -05:00