[QGIS Commit] [qgis/Quantum-GIS] 33e392: added postgis tools to sextante

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 33e3925eb79d6dda4b01326cca1a098d5b6140fc
      https://github.com/qgis/Quantum-GIS/commit/33e3925eb79d6dda4b01326cca1a098d5b6140fc
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-15 (Sat, 15 Dec 2012)

  Changed paths:
    M python/plugins/sextante/admintools/AdminToolsAlgorithmProvider.py
    M python/plugins/sextante/admintools/ImportIntoPostGIS.py
    M python/plugins/sextante/admintools/PostGISExecuteSQL.py
    M python/plugins/sextante/admintools/postgis_utils.py
    M python/plugins/sextante/grass/CMakeLists.txt
    M python/plugins/sextante/grass/description/r.describe.txt
    R python/plugins/sextante/grass/description/r.distance.txt
    M python/plugins/sextante/grass/description/r.drain.txt
    M python/plugins/sextante/grass/description/r.fill.dir.txt
    M python/plugins/sextante/grass/description/r.fillnulls.txt
    M python/plugins/sextante/grass/description/r.flow.txt
    A python/plugins/sextante/grass/ext/CMakeLists.txt
    R python/plugins/sextante/grass/postproc/CMakeLists.txt
    A python/plugins/sextante/images/database.png
    M python/plugins/sextante/mmqgisx/mmqgisx_library.py
    M python/plugins/sextante/parameters/ParameterString.py
    R python/plugins/sextante/saga/description/TableCalculator(Shapes).txt
    R python/plugins/sextante/saga/description/TableCalculator.txt

  Log Message:
  -----------
  added postgis tools to sextante
edited some grass descriptions and renamed postproc folder (now it is not only for postproc, but also for pre execution checks)


  Commit: 0c2fef4ed86c047f1c519c3646a7247e4248e985
      https://github.com/qgis/Quantum-GIS/commit/0c2fef4ed86c047f1c519c3646a7247e4248e985
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-12-15 (Sat, 15 Dec 2012)

  Changed paths:
    M python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
    M python/plugins/sextante/ftools/ConvexHull.py
    M src/app/legend/qgslegend.cpp
    M src/app/qgisapp.cpp
    M src/app/qgsundowidget.cpp
    M src/app/qgsundowidget.h
    M src/core/qgsexpression.h
    M src/core/qgsvectorlayer.cpp
    M src/core/raster/qgsrasterblock.cpp
    M src/core/raster/qgsrasterblock.h
    M src/core/raster/qgsrasterdataprovider.cpp
    M src/gui/qgsrubberband.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/gdal/qgsgdalprovider.h
    M src/providers/grass/CMakeLists.txt
    M src/providers/grass/qgsgrassgislib.cpp
    M src/providers/grass/qgsgrassgislib.h

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

Conflicts:
	python/plugins/sextante/grass/ext/CMakeLists.txt


Compare: https://github.com/qgis/Quantum-GIS/compare/3a59fd4dfdcd...0c2fef4ed86c