[QGIS Commit] [qgis/Quantum-GIS] dd6a59: [FEATURE] Make the gdaltools command editable to f...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: dd6a594178d6d480ff9585fde12fb7987c81e2d1
      https://github.com/qgis/Quantum-GIS/commit/dd6a594178d6d480ff9585fde12fb7987c81e2d1
  Author: Giuseppe Sucameli <brush.tyler at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M python/plugins/GdalTools/__init__.py
  A python/plugins/GdalTools/icons/edit.png
  A python/plugins/GdalTools/icons/reset.png
  M python/plugins/GdalTools/resources.qrc
  M python/plugins/GdalTools/tools/dialogBase.py
  M python/plugins/GdalTools/tools/dialogBase.ui
  M python/plugins/GdalTools/tools/widgetPluginBase.py

  Log Message:
  -----------
  [FEATURE] Make the gdaltools command editable to fix #3041


  Commit: 6ccb04e9b3569ae059b6bf8d88cbe6c654341021
      https://github.com/qgis/Quantum-GIS/commit/6ccb04e9b3569ae059b6bf8d88cbe6c654341021
  Author: Giuseppe Sucameli <brush.tyler at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M python/core/qgsrasterlayer.sip
  M python/plugins/GdalTools/__init__.py
  A python/plugins/GdalTools/icons/edit.png
  A python/plugins/GdalTools/icons/reset.png
  M python/plugins/GdalTools/resources.qrc
  M python/plugins/GdalTools/tools/dialogBase.py
  M python/plugins/GdalTools/tools/dialogBase.ui
  M python/plugins/GdalTools/tools/widgetPluginBase.py
  M src/app/qgisapp.cpp
  M src/app/qgsidentifyresults.cpp
  M src/app/qgsmaptoolidentify.cpp
  M src/app/qgsprojectproperties.cpp
  M src/app/qgstilescalewidget.cpp
  M src/core/raster/qgsrasterlayer.cpp
  M src/core/raster/qgsrasterlayer.h

  Log Message:
  -----------
  Merge remote-tracking branch 'brushtyler/master'

Conflicts:
	src/providers/postgres/qgspostgresprovider.cpp


Compare: https://github.com/qgis/Quantum-GIS/compare/f09417d...6ccb04e