Resolve merge conflicts for upstream merge

2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
--- a/pmd_common.php
+++ b/pmd_common.php
@@ -13,7 +13,6 @@ require_once './libraries/header_http.inc.php';

 $GLOBALS['PMD']['STYLE']          = 'default';

-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();

 $GLOBALS['script_display_field'] =