Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

2010-07-26 13:44:30 -07:00
parent 89b0a3082e 2a59451ac5
commit 428053bef5
164 changed files with 70695 additions and 65467 deletions
--- a/setup/lib/config_info.inc.php
+++ b/setup/lib/config_info.inc.php
@@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) {
    exit;
 }

-/**
- * Load paths.
- */
-require_once('./libraries/vendor_config.php');
-
 $cfg_db = array();

 // path to config file, relative to phpMyAdmin's root path