Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 144e00e5da92712336cb7d1370ffe830ffe5c58f https://github.com/phpmyadmin/phpmyadmin/commit/144e00e5da92712336cb7d1370ff... Author: Marc Delisle <marc@infomarc.info> Date: 2014-01-15 (Wed, 15 Jan 2014) Changed paths: M ChangeLog M doc/faq.rst M doc/intro.rst M export.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/display_export.lib.php Log Message: ----------- bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export) Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 379f8b6704154aaca0ad8768e6dfb7295fd81918 https://github.com/phpmyadmin/phpmyadmin/commit/379f8b6704154aaca0ad8768e6df... Author: Marc Delisle <marc@infomarc.info> Date: 2014-01-15 (Wed, 15 Jan 2014) Changed paths: M ChangeLog M doc/faq.rst M doc/intro.rst M export.php M libraries/config.default.php M libraries/config.values.php M libraries/config/messages.inc.php M libraries/display_export.lib.php M libraries/export.lib.php Log Message: ----------- Fix merge conflicts Signed-off-by: Marc Delisle <marc@infomarc.info> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f2a7359f1b8d...379f8b670415