Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 862778acc1a8c0813da6ffecd26cd6adddceaf26 https://github.com/phpmyadmin/phpmyadmin/commit/862778acc1a8c0813da6ffecd26c... Author: Marc Delisle <marc@infomarc.info> Date: 2012-10-16 (Tue, 16 Oct 2012) Changed paths: M ChangeLog M transformation_wrapper.php Log Message: ----------- bug #3577468 [display] Incorrect imagejpeg Syntax Breaks Image Transformation Commit: 01e8487a51b93bac5590d65288b6903683488dfe https://github.com/phpmyadmin/phpmyadmin/commit/01e8487a51b93bac5590d65288b6... Author: Marc Delisle <marc@infomarc.info> Date: 2012-10-16 (Tue, 16 Oct 2012) Changed paths: M ChangeLog M transformation_wrapper.php Log Message: ----------- Fix merge conflicts Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e940a8dacb0e...01e8487a51b9