Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 07f7ba239d44e1e2889c933deb8a8c9f656c0c95 https://github.com/phpmyadmin/phpmyadmin/commit/07f7ba239d44e1e2889c933deb8a... Author: Marc Delisle marc@infomarc.info Date: 2012-11-13 (Tue, 13 Nov 2012)

Changed paths: M ChangeLog M themes/original/css/theme_right.css.php M themes/pmahomme/css/theme_right.css.php

Log Message: ----------- bug #3585695 [CSS] Font size in inline query editor is way too big

Commit: fb3c180910c424979c478ffb4d489461449d5bad https://github.com/phpmyadmin/phpmyadmin/commit/fb3c180910c424979c478ffb4d48... Author: Marc Delisle marc@infomarc.info Date: 2012-11-13 (Tue, 13 Nov 2012)

Log Message: ----------- Merge branch 'QA_3_5'

Commit: 705fd0ff6e932eaa025c265142fbedb7d5720841 https://github.com/phpmyadmin/phpmyadmin/commit/705fd0ff6e932eaa025c265142fb... Author: Marc Delisle marc@infomarc.info Date: 2012-11-13 (Tue, 13 Nov 2012)

Changed paths: M ChangeLog M themes/pmahomme/css/codemirror.css.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/922c62a8813f...705fd0ff6e93