Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b2900f12af56f32a97f212542be25bc2931cdef0 https://github.com/phpmyadmin/phpmyadmin/commit/b2900f12af56f32a97f212542be2... Author: Marc Delisle marc@infomarc.info Date: 2014-03-16 (Sun, 16 Mar 2014)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- bug #4323 QueryWindow ignores CodeMirror

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

Commit: 383ffd5d3d35dc70a9ce3f2351ede60dc7a025b6 https://github.com/phpmyadmin/phpmyadmin/commit/383ffd5d3d35dc70a9ce3f2351ed... Author: Marc Delisle marc@infomarc.info Date: 2014-03-16 (Sun, 16 Mar 2014)

Changed paths: M ChangeLog M js/functions.js

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4b62652b9fc1...383ffd5d3d35