artemp a38b252ccd Merge branch 'master' into bigint
Conflicts:
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
..
2012-08-27 16:43:40 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2011-11-13 19:54:32 -08:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-08-24 13:49:28 -07:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-12-16 12:50:36 -08:00
2012-08-24 13:49:28 -07:00
2012-12-16 12:50:36 -08:00
2012-04-08 02:20:56 +02:00
2012-12-16 12:50:36 -08:00