Skip to content
Permalink
Browse files

Merge branch 'dxf_export' of github.com:mhugent/Quantum-GIS into dxf_…

…export
  • Loading branch information
mhugent committed Nov 23, 2013
2 parents a9d92cd + 34e1bd2 commit 78672056bcff201ca121af98338cf6e00d00b0d3
@@ -421,7 +421,7 @@ INCLUDE_DIRECTORIES(
../analysis/raster ../analysis/openstreetmap
../core
../core/gps
../core/composer ../core/raster ../core/symbology-ng
../core/composer ../core/dxf ../core/raster ../core/symbology-ng
../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster
../plugins
../python
@@ -62,7 +62,6 @@ SET(QGIS_CORE_SRCS
qgsdbfilterproxymodel.cpp
qgsdiagramrendererv2.cpp
qgsdistancearea.cpp
qgsdxfexport.cpp
qgserror.cpp
qgsexpression.cpp
qgsexpression_texts.cpp
@@ -161,6 +160,7 @@ SET(QGIS_CORE_SRCS
composer/qgscomposermultiframe.cpp
composer/qgscomposition.cpp

dxf/qgsdxfexport.cpp
dxf/qgsdxfpaintdevice.cpp
dxf/qgsdxfpaintengine.cpp

File renamed without changes.
File renamed without changes.

0 comments on commit 7867205

Please sign in to comment.
You can’t perform that action at this time.