[QGIS Commit] [qgis/Quantum-GIS] 5c762e: applied path for #6574

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 5c762ef741b251dbeba4e17d4f30bf4b59ebaa0e
      https://github.com/qgis/Quantum-GIS/commit/5c762ef741b251dbeba4e17d4f30bf4b59ebaa0e
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-10-27 (Sat, 27 Oct 2012)

  Changed paths:
    M python/plugins/sextante/ftools/FToolsAlgorithmProvider.py
    M python/plugins/sextante/ftools/FToolsUtils.py
    M python/plugins/sextante/ftools/PointsInPolygon.py
    A python/plugins/sextante/ftools/PointsInPolygonWeighted.py
    M python/plugins/sextante/ftools/ftools_utils.py
    M python/plugins/sextante/grass/GrassAlgorithm.py
    M python/plugins/sextante/grass/GrassAlgorithmProvider.py
    M python/plugins/sextante/grass/GrassUtils.py
    A python/plugins/sextante/grass/description/v.db.select.txt
    M python/plugins/sextante/r/RAlgorithm.py
    M python/plugins/sextante/saga/SagaAlgorithm.py

  Log Message:
  -----------
  applied path for #6574
applied patch for multiple grass sessions
added points in polygon weighted


  Commit: 34f677a576811972ec4b1518fe688d96b3b87a6a
      https://github.com/qgis/Quantum-GIS/commit/34f677a576811972ec4b1518fe688d96b3b87a6a
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-10-27 (Sat, 27 Oct 2012)

  Changed paths:
    M CMakeLists.txt
    M i18n/qgis_sv.ts
    A postinstall/CMakeLists.txt
    A postinstall/PostInstall.cmake.in
    M python/CMakeLists.txt
    M python/plugins/CMakeLists.txt
    M python/plugins/sextante/about/CMakeLists.txt
    M python/plugins/sextante/ftools/CMakeLists.txt
    M python/plugins/sextante/gdal/CMakeLists.txt
    M python/plugins/sextante/help/CMakeLists.txt
    M python/plugins/sextante/mmqgisx/CMakeLists.txt
    M python/plugins/sextante/pymorph/html/morph/CMakeLists.txt
    M src/app/legend/qgslegend.cpp
    M src/app/legend/qgslegend.h
    M src/app/legend/qgslegenditem.h
    M src/app/legend/qgslegendlayer.cpp
    M src/app/qgisapp.cpp
    M src/app/qgsmaptoolidentify.cpp
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsrasterlayerproperties.cpp
    M src/app/qgsrasterlayerproperties.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/qgsgeometry.cpp
    M src/core/qgsmaplayer.h
    M src/core/qgsmaprenderer.h
    M src/core/qgsscalecalculator.cpp
    M src/core/qgsscalecalculator.h
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
    M src/core/symbology-ng/qgsrendererv2.h
    M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
    M src/core/symbology-ng/qgsrulebasedrendererv2.h
    M src/gui/attributetable/qgsattributetablemodel.cpp
    M src/gui/attributetable/qgsattributetablemodel.h
    M src/mapserver/CMakeLists.txt
    M src/mapserver/qgis_map_serv.cpp
    M src/mapserver/qgsfilter.cpp
    M src/mapserver/qgshttprequesthandler.cpp
    M src/mapserver/qgspostrequesthandler.cpp
    M src/mapserver/qgsprojectparser.cpp
    A src/mapserver/qgsspatialfilter.cpp
    A src/mapserver/qgsspatialfilter.h
    M src/mapserver/qgswfsserver.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/mapserver/qgswmsserver.h
    M src/plugins/globe/CMakeLists.txt
    M src/ui/qgsprojectpropertiesbase.ui
    M src/ui/qgsrasterlayerpropertiesbase.ui
    M src/ui/qgsvectorlayerpropertiesbase.ui

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


Compare: https://github.com/qgis/Quantum-GIS/compare/779e16603ee3...34f677a57681