Resolve merge conflicts for upstream merge

This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
175 changed files with 76587 additions and 70379 deletions

View File

@@ -13,11 +13,11 @@ define('PMA_MINIMUM_COMMON', true);
/**
* Gets core libraries and defines some variables
*/
require_once './libraries/common.inc.php';
require './libraries/common.inc.php';
/**
* ZIP file handler.
*/
require_once './libraries/zip.lib.php';
require './libraries/zip.lib.php';
// ini file
$parameters = array(