Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3c587da09b368b98a73136cb7a5a192532c518d0 https://github.com/phpmyadmin/phpmyadmin/commit/3c587da09b368b98a73136cb7a5a... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M ChangeLog M js/pmd/ajax.js Log Message: ----------- bug #3518983 [designer] Error messages do not appear in the Designer Commit: 58a3c57e7a3d0488b8bc7ff5bafb7d3858400642 https://github.com/phpmyadmin/phpmyadmin/commit/58a3c57e7a3d0488b8bc7ff5bafb... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-18 (Wed, 18 Apr 2012) Changed paths: M ChangeLog M js/pmd/ajax.js Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b0e978...58a3c57