Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c46e6717b020e415f2ad2330d2cca661abc9b125 https://github.com/phpmyadmin/phpmyadmin/commit/c46e6717b020e415f2ad2330d2cc... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-07 (Fri, 07 Aug 2015)

Changed paths: M libraries/controllers/StructureController.class.php

Log Message: ----------- Update PHPDoc. Make PHPCS happy. Minor coding style modification.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 7f2d6698ca9d52a922ffa89e408ba9f4b9f9df16 https://github.com/phpmyadmin/phpmyadmin/commit/7f2d6698ca9d52a922ffa89e408b... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-08-07 (Fri, 07 Aug 2015)

Changed paths: M libraries/plugins/ExportPlugin.class.php M libraries/plugins/export/ExportSql.class.php

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad5baa88e917...7f2d6698ca9d