Alexander Bruy 31aed14ea2 Merge branch 'processing_add_gdal_raster_calc' of https://github.com/gioman/QGIS into gdal_calc
Conflicts:
	python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py
2015-02-24 11:04:33 +02:00
..
2015-02-04 07:15:49 +01:00