Project: Joomla

Revision: 10152

Author: eddieajau

Date: 19 Mar 2008 07:04:54

Changes:

Trunk merge

Files:
copied: from /development/releases/1.5/LICENSES.php (r10131) to /development/trunk/LICENSES.php (try)
modified: /development/trunk/htaccess.txt (try)
modified: /development/trunk/libraries/joomla/application/component/controller.php (try)
modified: /development/trunk/CHANGELOG.php (try)
modified: /development/trunk/index.php (try)
modified: /development/trunk/COPYRIGHT.php (try)
modified: /development/trunk/configuration.php-dist (try)
modified: /development/trunk/libraries/joomla/application/component/view.php (try)
copied: from /development/releases/1.5/CREDITS.php (r10131) to /development/trunk/CREDITS.php (try)
modified: /development/trunk/libraries/joomla/application/router.php (try)
modified: /development/trunk/libraries/joomla/application/component/helper.php (try)
modified: /development/trunk/libraries/joomla/application/component/model.php (try)
modified: /development/trunk/libraries/loader.php (try)
modified: /development/trunk/libraries/joomla/application/application.php (try)
modified: /development/trunk/libraries/joomla/application/module/helper.php (try)
Diff: