Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ad1bc257e4f3d71925c53d7338fec5a7ce05efb9 https://github.com/phpmyadmin/phpmyadmin/commit/ad1bc257e4f3d71925c53d7338fe... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-07-28 (Sat, 28 Jul 2012)

Changed paths: M ChangeLog M tbl_select.php

Log Message: ----------- bug #3548491 [interface] Inline query editor doesn't work from search results

Commit: 9282f48cafe391cb067c4d2ce470687830adb679 https://github.com/phpmyadmin/phpmyadmin/commit/9282f48cafe391cb067c4d2ce470... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-07-28 (Sat, 28 Jul 2012)

Changed paths: M ChangeLog

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

Conflicts: tbl_select.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/17ad24346933...9282f48cafe3