[QGIS Commit] [qgis/Quantum-GIS] 3334c9: Merge branch 'master' of github.com:qgis/Quantum-G...

[GitHub]

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

  Changed paths:
    M debian/changelog
  A debian/qbrowser.desktop
  M debian/qgis.desktop
  M debian/qgis.install
  M i18n/qgis_de.ts
  M i18n/qgis_it.ts
  M python/core/qgscomposition.sip
  M src/app/composer/qgscomposer.cpp
  M src/app/composer/qgscomposer.h
  M src/app/qgisapp.cpp
  M src/app/qgisapp.h
  M src/core/composer/qgscomposition.cpp
  M src/core/composer/qgscomposition.h
  M src/core/qgsvectorlayer.cpp
  M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  M src/gui/qgscomposerview.cpp
  M src/gui/qgsprojectionselector.cpp
  M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  M src/mapserver/qgsconfigparser.cpp
  M src/mapserver/qgsconfigparser.h
  M src/mapserver/qgsprojectparser.cpp
  M src/mapserver/qgsprojectparser.h
  M src/mapserver/qgswmsserver.cpp
  M src/plugins/grass/modules/default.qgc
  A src/plugins/grass/modules/r.aspect.1.png
  A src/plugins/grass/modules/r.aspect.2.png
  A src/plugins/grass/modules/r.aspect.qgm
  A src/plugins/grass/modules/r.slope.1.png
  A src/plugins/grass/modules/r.slope.2.png
  A src/plugins/grass/modules/r.slope.qgm
  M src/plugins/grass/modules/v.random.qgm
  M src/plugins/grass/modules/v.surf.bspline.qgm
  M src/plugins/grass/modules/v.surf.idw.qgm
  M src/plugins/grass/modules/v.surf.rst.qgm
  M src/providers/wms/qgswmsprovider.cpp
  M src/providers/wms/qgswmsprovider.h
  M src/providers/wms/qgswmssourceselect.cpp
  M src/ui/qgswmssourceselectbase.ui

  Log Message:
  -----------
  Merge branch 'master' of github.com:qgis/Quantum-GIS


  Commit: c0cf1abee5dc541444505270e1afe85fc9ff24d2
      https://github.com/qgis/Quantum-GIS/commit/c0cf1abee5dc541444505270e1afe85fc9ff24d2
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M python/core/qgscomposeritem.sip
  M src/core/composer/qgscomposeritem.h

  Log Message:
  -----------
  [BACKPORT] Nicer api for composer item frames and carry docs through to sip.


Compare: https://github.com/qgis/Quantum-GIS/compare/cda3693...c0cf1ab