mark_story 58383d3cb9 Merge branch '1.2' into 1.3-merger ... Conflicts: cake/console/libs/tasks/controller.php cake/console/libs/tasks/model.php		2009-11-15 20:05:55 -05:00
..
cache	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
controller	Merge commit 'origin/1.2' into mergers	2009-11-08 22:21:21 -05:00
log	Merge branch '1.3-misc' of dev@code.cakephp.org:cakephp into 1.3-misc	2009-11-06 09:24:55 -05:00
model	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
view	Fixing failing test, picked in from 1.2.	2009-11-13 09:53:31 -05:00
cache.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
cake_log.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
cake_session.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
cake_socket.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
class_registry.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
configure.php	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
debugger.php	Merge branch '1.2' into 1.3-merger	2009-11-01 12:11:49 -05:00
error.php	Merge branch '1.3-misc' into mergers	2009-11-08 21:39:55 -05:00
file.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
folder.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
http_socket.php	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
i18n.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
inflector.php	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
l10n.php	Fix order of keys in l10n catalog list	2009-11-06 15:46:54 +03:00
magic_db.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
multibyte.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
object.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
overloadable.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
overloadable_php4.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
overloadable_php5.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
router.php	Merge branch '1.2' into 1.3-merger	2009-11-15 20:05:55 -05:00
sanitize.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
security.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
set.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00
string.php	Fixing String::insert() when $data is an empty array. Which was happening in the dbo source tests.	2009-11-03 18:21:01 -05:00
validation.php	Update license lines throughout.	2009-11-06 17:51:51 +11:00
xml.php	Removing newline caused by Subversion line removal.	2009-11-06 18:01:22 +11:00