Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a26aec4d809bdbb396fcbc8ec7fa121203b05390 https://github.com/phpmyadmin/phpmyadmin/commit/a26aec4d809bdbb396fcbc8ec7fa... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-21 (Sat, 21 Apr 2012) Changed paths: M ChangeLog M db_structure.php M js/db_structure.js Log Message: ----------- bug #3516089 [structure] DROP does not work on defective VIEWs Commit: da0e04d179e8e11f3a0023e17305857c6fe6fbbd https://github.com/phpmyadmin/phpmyadmin/commit/da0e04d179e8e11f3a0023e17305... Author: Marc Delisle <marc@infomarc.info> Date: 2012-04-21 (Sat, 21 Apr 2012) Changed paths: M ChangeLog M db_structure.php M js/db_structure.js Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e78a25a...da0e04d