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
..
2013-04-06 18:30:28 +02:00
2014-04-19 00:30:38 +02:00
2012-10-11 17:15:32 +02:00
2012-10-11 17:15:32 +02:00
2012-09-24 18:43:20 +02:00
2012-10-06 13:32:08 +02:00
2014-02-24 00:43:20 +01:00
2013-11-04 10:51:01 +01:00