Alexander Bruy 730c5806aa Merge branch 'processing_exps' of https://github.com/volaya/QGIS into processing_exps
Conflicts:
	python/plugins/processing/gui/NumberInputPanel.py
	python/plugins/processing/gui/OutputSelectionPanel.py
2016-05-13 09:26:55 +03:00
..
2016-04-25 15:58:40 +02:00