Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5088e86fd125f48967c4f22f668ab380afbad87c https://github.com/phpmyadmin/phpmyadmin/commit/5088e86fd125f48967c4f22f668a... Author: Yuichiro Takahashi yuichiro@pop07.odn.ne.jp Date: 2012-05-05 (Sat, 05 May 2012)

Changed paths: M ChangeLog M libraries/import.lib.php

Log Message: ----------- Fix popup message on build SQL of import

Commit: f2d19ef5687068253197a06ed0a443d17192b4f9 https://github.com/phpmyadmin/phpmyadmin/commit/f2d19ef5687068253197a06ed0a4... Author: Marc Delisle marc@infomarc.info Date: 2012-05-05 (Sat, 05 May 2012)

Changed paths: M ChangeLog M libraries/import.lib.php

Log Message: ----------- Fix merge conflicts

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/533ec68...f2d19ef