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/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -8,13 +8,7 @@ if (! defined('PHPMYADMIN')) {
    exit;
 }

-/**
- *
- */
-require_once './libraries/Table.class.php';
-
 // Get relations & co. status
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();