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

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: fd7e03d7b3881b8a8e7eb4515b317b2be2d24301
      https://github.com/qgis/Quantum-GIS/commit/fd7e03d7b3881b8a8e7eb4515b317b2be2d24301
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M python/core/symbology-ng-core.sip
  M python/plugins/fTools/tools/doGeometry.py
  M src/app/qgisapp.cpp
  M src/app/qgsmaptooloffsetcurve.cpp
  M src/core/symbology-ng/qgsrendererv2.cpp
  M src/core/symbology-ng/qgsrendererv2.h
  M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  M src/core/symbology-ng/qgsrulebasedrendererv2.h
  M src/plugins/grass/modules/r.mask.qgm
  M tests/src/core/testqgsrulebasedrenderer.cpp

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


  Commit: 1a78f0b15a1c343009b015b009a21374b1c1482b
      https://github.com/qgis/Quantum-GIS/commit/1a78f0b15a1c343009b015b009a21374b1c1482b
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M python/core/qgscomposershape.sip

  Log Message:
  -----------
  [BACKPORT] added more missing python bindings for composer api


Compare: https://github.com/qgis/Quantum-GIS/compare/ad955e2...1a78f0b