Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4ca0aad458b21e51e1b66f760070b888d908f534 https://github.com/phpmyadmin/phpmyadmin/commit/4ca0aad458b21e51e1b66f760070... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)

Changed paths: M libraries/tcpdf/tcpdf.php

Log Message: ----------- Temporarily make TCPDF method _destroyAll() public. Fixes 'Warning: (Registered shutdown functions) Unable to call TCPDF::_destroyAll() - function does not exist in Unknown on line 0'

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: 7793dd3e90337f25a099d4c17b496cce2652f7c5 https://github.com/phpmyadmin/phpmyadmin/commit/7793dd3e90337f25a099d4c17b49... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-11 (Thu, 11 Dec 2014)

Changed paths: M ChangeLog M js/console.js M libraries/structure.lib.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ffa83ae0d736...7793dd3e9033