Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e1a722dee799f5013cdff90c611d65a4ac760cca https://github.com/phpmyadmin/phpmyadmin/commit/e1a722dee799f5013cdff90c611d... Author: Marc Delisle marc@infomarc.info Date: 2014-11-16 (Sun, 16 Nov 2014)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- bug #4576 Issue with long comments on table columns

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: babad6efe515e62053d9af96b2a634a29ff2c943 https://github.com/phpmyadmin/phpmyadmin/commit/babad6efe515e62053d9af96b2a6... Author: Marc Delisle marc@infomarc.info Date: 2014-11-16 (Sun, 16 Nov 2014)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- Fix merge conflicts

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3d038ced197d...babad6efe515