Merge branch 'Issue_8725-OGR' of https://github.com/ahuarte47/QGIS in… · qgis/QGIS@9195356 · GitHub

Commit

Merge branch 'Issue_8725-OGR' of https://github.com/ahuarte47/QGIS in…

Browse files

…to Issue_8725-OGR

Conflicts:
	src/app/qgsoptions.cpp
	src/app/qgsoptions.h
	src/core/symbology-ng/qgssymbollayerv2.cpp

Loading branch information

ahuarte47 committed Dec 17, 2013

2 parents bda114b + 566e5bd commit 9195356