[QGIS Commit] [qgis/Quantum-GIS] 27f197: fixed problems with missing example scripts folder

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 27f197cf242416ce3aa6a2e71ec9fe5dbf8e5378
      https://github.com/qgis/Quantum-GIS/commit/27f197cf242416ce3aa6a2e71ec9fe5dbf8e5378
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    A python/plugins/sextante/add_OTB_segmentation_algs.patch
    M python/plugins/sextante/admintools/AdminToolsAlgorithmProvider.py
    M python/plugins/sextante/admintools/CMakeLists.txt
    A python/plugins/sextante/admintools/ImportIntoPostGIS.py
    M python/plugins/sextante/admintools/PostGISExecuteSQL.py
    M python/plugins/sextante/admintools/geoserver/CMakeLists.txt
    M python/plugins/sextante/admintools/httplib2/CMakeLists.txt
    R python/plugins/sextante/algs/SextanteVectorWriter.py
    M python/plugins/sextante/core/Sextante.py
    M python/plugins/sextante/core/SextanteVectorWriter.py
    M python/plugins/sextante/gdal/CMakeLists.txt
    R python/plugins/sextante/gdal/GdalAlgorithmProvider.py
    A python/plugins/sextante/gdal/GdalOgrAlgorithmProvider.py
    A python/plugins/sextante/gdal/OgrAlgorithm.py
    A python/plugins/sextante/gdal/gdaladdo.py
    M python/plugins/sextante/gdal/information.py
    M python/plugins/sextante/gdal/merge.py
    M python/plugins/sextante/gdal/nearblack.py
    A python/plugins/sextante/gdal/ogr2ogr.py
    A python/plugins/sextante/gdal/ogrinfo.py
    A python/plugins/sextante/gdal/ogrsql.py
    M python/plugins/sextante/gdal/pct2rgb.py
    M python/plugins/sextante/gdal/polygonize.py
    A python/plugins/sextante/gdal/pyogr/CMakeLists.txt
    A python/plugins/sextante/gdal/pyogr/__init__.py
    A python/plugins/sextante/gdal/pyogr/ogr2ogr.py
    A python/plugins/sextante/gdal/pyogr/ogrds.py
    A python/plugins/sextante/gdal/pyogr/ogrvrt.py
    M python/plugins/sextante/gdal/rgb2pct.py
    M python/plugins/sextante/gdal/scripts/fillnodata.py
    M python/plugins/sextante/gdal/scripts/proximity.py
    M python/plugins/sextante/gdal/scripts/sieve.py
    M python/plugins/sextante/gdal/translate.py
    M python/plugins/sextante/gdal/warp.py
    M python/plugins/sextante/grass/GrassAlgorithmProvider.py
    M python/plugins/sextante/gui/BatchProcessingDialog.py
    M python/plugins/sextante/modeler/CMakeLists.txt
    M python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
    M python/plugins/sextante/modeler/ModelerDialog.py
    M python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py
    M python/plugins/sextante/modeler/ModelerParametersDialog.py
    A python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation.txt
    A python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation_vector.txt
    M python/plugins/sextante/otb/description/MeanShiftSegmentation.txt
    A python/plugins/sextante/otb/description/MeanShiftSegmentation_vector.txt
    A python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation.txt
    A python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation_vector.txt
    A python/plugins/sextante/otb/description/WatershedSegmentation.txt
    A python/plugins/sextante/otb/description/WatershedSegmentation_vector.txt
    M python/plugins/sextante/r/RAlgorithmProvider.py
    M python/plugins/sextante/saga/SagaAlgorithmProvider.py
    M python/plugins/sextante/script/CMakeLists.txt
    M python/plugins/sextante/script/ScriptAlgorithm.py
    M python/plugins/sextante/script/ScriptAlgorithmProvider.py
    A python/plugins/sextante/script/scripts/Save_selected_features.py
    R python/plugins/sextante/script/scripts/dummy.txt

  Log Message:
  -----------
  fixed problems with missing example scripts folder
Restructured gdal tools (now gdal/ogr)
Added new OTB segmentation algos


  Commit: 1c0f7a22795cd1406958198cdbe8689ddcb15001
      https://github.com/qgis/Quantum-GIS/commit/1c0f7a22795cd1406958198cdbe8689ddcb15001
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-11-09 (Fri, 09 Nov 2012)

  Changed paths:
    M python/core/qgspallabeling.sip
    M python/plugins/fTools/fTools.py
    M python/plugins/fTools/icons/default/CMakeLists.txt
    A python/plugins/fTools/icons/default/eliminate.png
    A python/plugins/fTools/icons/gis/eliminate.png
    M python/plugins/fTools/resources.qrc
    A python/plugins/fTools/tools/doEliminate.py
    M python/plugins/fTools/tools/doGeoprocessing.py
    A python/plugins/fTools/tools/frmEliminate.ui
    M python/plugins/sextante/saga/SagaAlgorithm.py
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/gui/qgsrubberband.cpp
    M src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
    M src/ui/qgslabelingguibase.ui
    M tests/src/python/CMakeLists.txt
    M tests/src/python/test_qgsmemoryprovider.py
    A tests/src/python/test_qgsvectorfilewriter.py
    M tests/src/python/utilities.py

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


Compare: https://github.com/qgis/Quantum-GIS/compare/e5f07edf5578...1c0f7a22795c