Martin Dobias a7cf5e4b83 [FEATURE] Merge branch 'rules' - new rule-based rendering
Conflicts:
	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
2012-01-24 11:51:36 +01:00
..