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

Conflicts: libraries/display_export.lib.php
2010-07-20 15:23:12 -07:00
parent 07d68cb79f d229f6ca24
commit aa49b85fad
321 changed files with 125955 additions and 126852 deletions
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -74,8 +74,6 @@ $forms['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Import_export'] = array(
    'UploadDir',
    'SaveDir',
-    'AllowAnywhereRecoding',
-    'DefaultCharset',
    'RecodingEngine',
    'IconvExtraParams',
    'ZipDump',