Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: a48ca709f50748741b978e6aea03ee8a21961a46 https://github.com/phpmyadmin/phpmyadmin/commit/a48ca709f50748741b978e6aea03... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M ChangeLog M js/sql.js Log Message: ----------- bug #4736 Changing display options breaks query highlighting Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: f20406e14d93e35be4f0a93f1488dc7f62ae12d8 https://github.com/phpmyadmin/phpmyadmin/commit/f20406e14d93e35be4f0a93f1488... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2015-01-27 (Tue, 27 Jan 2015) Changed paths: M po/hi.po Log Message: ----------- Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6d142059923f...f20406e14d93