[QGIS Commit] [qgis/Quantum-GIS] 36a69a: Applied patch from Borys for heatmap context help

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 36a69afc431080bc7d62681d1b30557e878854f2
      https://github.com/qgis/Quantum-GIS/commit/36a69afc431080bc7d62681d1b30557e878854f2
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M resources/context_help/HeatmapGui-en_US

  Log Message:
  -----------
  Applied patch from Borys for heatmap context help


  Commit: 6c50f7aca435696e5e041d897f91e495df885f33
      https://github.com/qgis/Quantum-GIS/commit/6c50f7aca435696e5e041d897f91e495df885f33
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M i18n/qgis_de.ts
  M i18n/qgis_it.ts
  M python/core/qgsmaplayerregistry.sip
  A resources/context_help/HeatmapGui-de_DE
  M resources/context_help/HeatmapGui-en_US
  M src/app/qgisapp.cpp
  M src/core/qgsapplication.cpp
  M src/core/qgsmaplayerregistry.h
  M src/plugins/heatmap/heatmap.cpp
  M src/plugins/heatmap/heatmap.h
  M src/plugins/heatmap/heatmapgui.cpp
  M src/plugins/heatmap/heatmapgui.h

  Log Message:
  -----------
  Merge changes from QGIS upstream


Compare: https://github.com/qgis/Quantum-GIS/compare/a080538...6c50f7a