José Lorenzo Rodríguez f2b707ac0b Merge remote branch 'origin/2.0' into feature/2.0/pdo ... Conflicts: cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php cake/tests/cases/libs/model/datasources/dbo_source.test.php		2010-11-16 21:54:42 -04:30
..
config	Merge branch '1.3' into integration	2010-10-31 21:56:59 -04:00
console	Merge remote branch 'origin/2.0' into feature/2.0/pdo	2010-11-16 21:54:42 -04:30
libs	Merge remote branch 'origin/2.0' into feature/2.0/pdo	2010-11-16 21:54:42 -04:30
tests	Merge remote branch 'origin/2.0' into feature/2.0/pdo	2010-11-16 21:54:42 -04:30
basics.php	Unwinding several ifs used in debug(). Creating simple string templates instead. Fixes #818	2010-10-24 18:23:27 -04:00
bootstrap.php	Pulling App out into its own file. Trying to stick with one class per file conventions.	2010-11-14 13:02:30 -05:00
LICENSE.txt	Fixing cakephp domain name.	2010-01-26 17:15:15 -05:00
VERSION.txt	Updating version numbers for 1.3.5	2010-10-24 13:56:45 -04:00