Branch: refs/heads/QA_4_3
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c2cf281dd65aa97fb6aac7f16bc995636d25b973
https://github.com/phpmyadmin/phpmyadmin/commit/c2cf281dd65aa97fb6aac7f16bc995636d25b973
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M libraries/gis/GIS_Factory.class.php
Log Message:
-----------
Fix merge errors. MB functions are not required to handle geometry type names
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 0ca9f5f2c8f644a11c75ce32db510814f0903b3d
https://github.com/phpmyadmin/phpmyadmin/commit/0ca9f5f2c8f644a11c75ce32db510814f0903b3d
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M po/pt.po
Log Message:
-----------
Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/23d65f688978...0ca9f5f2c8f6------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
