mark_story 6f5ff4d7dd Merge branch 'master' into 2.3 ... Conflicts: lib/Cake/Model/CakeSchema.php lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php		2012-12-13 20:20:42 -05:00
..
CakeNumberTest.php	Squashed commit of the following:	2012-10-26 19:32:39 +02:00
CakeTimeTest.php	Fix more off by a second errors	2012-10-28 16:15:20 -04:00
ClassRegistryTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
DebuggerTest.php	Merge branch 'master' into 2.3	2012-12-13 20:20:42 -05:00
FileTest.php	Try to make some time related test failures go away.	2012-09-20 21:07:14 -04:00
FolderTest.php	Fix failing tests.	2012-11-11 21:57:52 -05:00
HashTest.php	fixing issue where merge is renumbering array keys	2012-12-07 01:26:14 +00:00
InflectorTest.php	Pushed before fxing error in test case, I suck. Refs #3291	2012-10-22 23:09:31 +02:00
ObjectCollectionTest.php	Merge remote-tracking branch 'origin/2.1' into 2.2	2012-04-29 20:05:39 -04:30
SanitizeTest.php	Update 1.x @link in docblocks	2012-04-26 19:49:18 -07:00
SecurityTest.php	code optimizing and simplify _crypt(), see PR #853	2012-11-01 14:15:52 +01:00
SetTest.php	Merge remote-tracking branch 'origin/master' into 2.3	2012-12-01 23:19:53 +01:00
StringTest.php	Fix failing tests using chr(226) instead of unicode codes.	2012-11-09 22:32:29 -05:00
ValidationTest.php	Merge remote-tracking branch 'origin/master' into 2.3	2012-12-01 23:19:53 +01:00
XmlTest.php	Fix warnings from file_get_contents() in Xml::build()	2012-11-19 14:46:45 -05:00