mark_story 9a8ceaeba6 Merge branch '2.1' into 2.2 ... Conflicts: lib/Cake/Test/Case/View/XmlViewTest.php		2012-05-30 21:20:56 -04:00
..
CakeNumber.php	Update doc blocks for CakeNumber.	2012-04-08 12:35:44 -04:00
CakeTime.php	Changing int to integer	2012-05-22 16:34:07 +01:00
ClassRegistry.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Debugger.php	Merge branch '2.1' into 2.2	2012-05-16 21:08:06 -04:00
File.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Folder.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Hash.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Inflector.php	Fixing coding conventions	2012-05-19 16:08:40 +01:00
ObjectCollection.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Sanitize.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Security.php	Updated copyright to 2012.	2012-03-12 22:46:07 -04:00
Set.php	Merge branch '2.1' into 2.2	2012-05-30 21:20:56 -04:00
String.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00
Validation.php	Changing File->info() to File->mime() in Validation::mimeType()	2012-05-28 00:48:22 +02:00
Xml.php	Updating mixed @param documentation to seperate list of accepted types	2012-05-21 21:55:10 +01:00