Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 27202362f0f060e88397f13ed0a7ad9e5b6d1951 https://github.com/phpmyadmin/phpmyadmin/commit/27202362f0f060e88397f13ed0a7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-04 (Sun, 04 May 2014)

Changed paths: M ChangeLog M libraries/tbl_gis_visualization.lib.php

Log Message: ----------- bug #4313 GIS Visualization Extension does not work with PointFromText() function

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: bc816af9005378d7f03915a261c52cb421527b51 https://github.com/phpmyadmin/phpmyadmin/commit/bc816af9005378d7f03915a261c5... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-04 (Sun, 04 May 2014)

Changed paths: M ChangeLog M js/tbl_zoom_plot_jqplot.js M libraries/TableSearch.class.php M libraries/config/FormDisplay.tpl.php M libraries/display_create_table.lib.php M libraries/index.lib.php M libraries/server_privileges.lib.php M libraries/structure.lib.php M po/ta.po M themes/pmahomme/css/common.css.php

Log Message: ----------- Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Conflicts: ChangeLog

Commit: 49922f24f975bb15f1dc4525f96f55c272f72103 https://github.com/phpmyadmin/phpmyadmin/commit/49922f24f975bb15f1dc4525f96f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-04 (Sun, 04 May 2014)

Changed paths: M ChangeLog M libraries/tbl_gis_visualization.lib.php

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cdb600528e11...49922f24f975