Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fc0a16a55e13dfca761ca2913311b894265f3e66 https://github.com/phpmyadmin/phpmyadmin/commit/fc0a16a55e13dfca761ca2913311... Author: Marc Delisle marc@infomarc.info Date: 2012-04-18 (Wed, 18 Apr 2012)

Changed paths: M js/pmd/ajax.js

Log Message: ----------- Replace layer_alert() with PMA_ajaxShowMessage(), thanks to Rouslan Placella for the suggestion.

Commit: 21e3f2708035e89dc3ff78e9350bf82d25bb7957 https://github.com/phpmyadmin/phpmyadmin/commit/21e3f2708035e89dc3ff78e9350b... Author: Marc Delisle marc@infomarc.info Date: 2012-04-18 (Wed, 18 Apr 2012)

Changed paths: M js/pmd/ajax.js

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/58a3c57...21e3f27