AD7six
|
bd0a303c09
|
Merge branch '2.0' of github.com:cakephp/cakephp into 2.0
|
2011-05-15 11:28:47 +02:00 |
|
Jose Lorenzo Rodriguez
|
91bce16e9d
|
Merge remote-tracking branch 'origin/2.0' into 2.0-merge
Conflicts:
lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/Test/Case/Log/Engine/FileLog.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/plugged_helper.php
lib/Cake/Test/test_app/Plugin/TestPlugin/View/Helper/test_plugin_app.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php
lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticateTest.php
lib/Cake/tests/Case/Log/Engine/FileLog.php
lib/Cake/tests/Case/Log/Engine/FileLogTest.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/PluggedHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/TestPluginAppHelper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/plugged_helper.php
lib/Cake/tests/test_app/plugins/test_plugin/View/Helper/test_plugin_app.php
|
2011-05-15 00:40:54 -04:30 |
|
Jose Lorenzo Rodriguez
|
7ba60ff424
|
Changing more paths
|
2011-05-13 03:15:04 -04:30 |
|
Jose Lorenzo Rodriguez
|
8746a485bd
|
Search and replace for changed paths
|
2011-05-13 02:53:35 -04:30 |
|
Jose Lorenzo Rodriguez
|
900dfef2f7
|
Starting unification of casing in remaining folders
|
2011-05-13 01:53:49 -04:30 |
|