[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5088e8: Fix popup message on build SQL of import

Marc Delisle marc at infomarc.info
Sat May 5 13:00:44 CEST 2012


  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5088e86fd125f48967c4f22f668ab380afbad87c
      https://github.com/phpmyadmin/phpmyadmin/commit/5088e86fd125f48967c4f22f668ab380afbad87c
  Author: Yuichiro Takahashi <yuichiro at 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/f2d19ef5687068253197a06ed0a443d17192b4f9
  Author: Marc Delisle <marc at 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


More information about the Git mailing list