Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 011438e74a11d3b1b820c077fa44907f389cd9af https://github.com/phpmyadmin/phpmyadmin/commit/011438e74a11d3b1b820c077fa44... Author: Marc Delisle marc@infomarc.info Date: 2015-04-15 (Wed, 15 Apr 2015)

Changed paths: M ChangeLog M libraries/bfShapeFiles/ShapeFile.lib.php

Log Message: ----------- Bug PHP 7 compatibility in bfShapeFiles

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

Commit: 7df3cb4552111ab3383507c2c97a021f362643ad https://github.com/phpmyadmin/phpmyadmin/commit/7df3cb4552111ab3383507c2c97a... Author: Marc Delisle marc@infomarc.info Date: 2015-04-15 (Wed, 15 Apr 2015)

Changed paths: M ChangeLog M libraries/bfShapeFiles/ShapeFile.lib.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ad1a3846b79...7df3cb455211