Martin Dobias e4ab3f2aea Merge remote-tracking branch 'rouault/use_geos_reentrant_api'
Conflicts:
	src/core/pal/layer.cpp
	src/core/qgsgeometry.cpp
	src/core/qgspallabeling.cpp
2014-09-13 19:28:25 +07:00
..
2014-04-19 00:30:38 +02:00