[QGIS Commit] [qgis/Quantum-GIS] bd5194: Merge remote-tracking branch 'upstream/master'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: bd519448c18b088757fcc1bef25780bf9cb62a0d
      https://github.com/qgis/Quantum-GIS/commit/bd519448c18b088757fcc1bef25780bf9cb62a0d
  Author: Alexander Bruy <alexander.bruy at gmail.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/core/qgsmaplayerregistry.h
  M src/plugins/heatmap/heatmap.cpp
  M src/plugins/heatmap/heatmapgui.cpp

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


  Commit: a080538aec97b6685a8cbadcf2446bbde6daa30d
      https://github.com/qgis/Quantum-GIS/commit/a080538aec97b6685a8cbadcf2446bbde6daa30d
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M src/app/qgisapp.cpp

  Log Message:
  -----------
  enable Toggle editing button depending on layer type (fix #4965)


Compare: https://github.com/qgis/Quantum-GIS/compare/2b07e3d...a080538