[QGIS Commit] [qgis/Quantum-GIS] : Reapply cosmetical changes

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 878b04843df4babfd4d2856c679255683acbbe12
      https://github.com/qgis/Quantum-GIS/commit/878b04843df4babfd4d2856c679255683acbbe12
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M src/analysis/raster/qgsaspectfilter.h
  M src/analysis/raster/qgsderivativefilter.cpp
  M src/analysis/raster/qgsderivativefilter.h
  M src/analysis/raster/qgsninecellfilter.cpp
  M src/analysis/raster/qgsninecellfilter.h
  M src/analysis/raster/qgsruggednessfilter.cpp
  M src/analysis/raster/qgsslopefilter.cpp
  M src/analysis/raster/qgsslopefilter.h
  M src/analysis/raster/qgstotalcurvaturefilter.cpp
  M src/analysis/raster/qgstotalcurvaturefilter.h

  Log Message:
  -----------
  Reapply cosmetical changes


  Commit: 8ed3e6d68d96713bf139953163169a809bd2998a
      https://github.com/qgis/Quantum-GIS/commit/8ed3e6d68d96713bf139953163169a809bd2998a
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-01-12 (Thu, 12 Jan 2012)

  Changed paths:
    M src/analysis/CMakeLists.txt
  M src/analysis/raster/qgsaspectfilter.h
  M src/analysis/raster/qgsderivativefilter.cpp
  A src/analysis/raster/qgshillshadefilter.cpp
  A src/analysis/raster/qgshillshadefilter.h
  M src/analysis/raster/qgsninecellfilter.cpp
  M src/analysis/raster/qgsninecellfilter.h
  A src/analysis/raster/qgsrelief.cpp
  A src/analysis/raster/qgsrelief.h
  M src/analysis/raster/qgsruggednessfilter.h
  M src/analysis/raster/qgsslopefilter.h
  M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
  M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
  M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.ui
  M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp
  M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h

  Log Message:
  -----------
  Merge branch 'relief'


Compare: https://github.com/qgis/Quantum-GIS/compare/47ca431...8ed3e6d