Merge branch 'coloramp' of ../qgis-etiennesky

qgis · Aug 3, 2012 · f8f034c · f8f034c
2 parents de5f95b + e39c216
commit f8f034c
Show file tree

Hide file tree

Showing 20 changed files with 2,245 additions and 22 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -410,7 +410,7 @@ SET(QGIS_CORE_HDRS
   symbology/qgssymbologyutils.h
 
   symbology-ng/qgscategorizedsymbolrendererv2.h
-  symbology-ng/qgscolorbrewerpalette.h
+  symbology-ng/qgscolorrampv2data.h
   symbology-ng/qgsellipsesymbollayerv2.h
   symbology-ng/qgsfillsymbollayerv2.h
   symbology-ng/qgsgraduatedsymbolrendererv2.h