[QGIS Commit] [qgis/Quantum-GIS] 0e2f92: Updated model parameters window

GitHub noreply at github.com
Fri Oct 12 10:17:08 PDT 2012


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

  Changed paths:
    M python/plugins/sextante/gui/ParametersPanel.py
    M python/plugins/sextante/modeler/ModelerParametersDialog.py
    M python/plugins/sextante/otb/OTBAlgorithm.py
    M python/plugins/sextante/saga/SagaAlgorithm.py
    M python/plugins/sextante/saga/description/ChannelNetwork.txt
    M python/plugins/sextante/saga/description/UpslopeArea.txt

  Log Message:
  -----------
  Updated model parameters window
fixed #6417


  Commit: 5df9bc36e7788fe67959c1b2b511c227f22cdfa5
      https://github.com/qgis/Quantum-GIS/commit/5df9bc36e7788fe67959c1b2b511c227f22cdfa5
  Author: Victor Olaya <volayaf at gmail.com>
  Date:   2012-10-12 (Fri, 12 Oct 2012)

  Changed paths:
    A .gitattributes
    M .gitignore
    R .project
    R .pydevproject
    M CMakeLists.txt
    M Doxyfile
    M cmake/FindLibPython.py
    M cmake/FindPyQt.py
    M cmake/FindSIP.py
    M cmake/PythonCompile.py
    A cmake/QsciAPI.cmake
    M debian/changelog
    A debian/compat.quantal
    M debian/control.lucid
    M debian/control.precise
    A debian/control.quantal
    M debian/control.sid
    M debian/control.squeeze
    M debian/control.wheezy
    A debian/python-qgis.install.quantal
    M debian/rules
    M doc/AUTHORS
    M doc/TRANSLATORS
    M doc/build.sh
    M i18n/qgis_af.ts
    M i18n/qgis_ar.ts
    M i18n/qgis_bg.ts
    M i18n/qgis_ca_ES.ts
    M i18n/qgis_cs_CZ.ts
    M i18n/qgis_da_DK.ts
    M i18n/qgis_de.ts
    M i18n/qgis_el_GR.ts
    M i18n/qgis_es.ts
    M i18n/qgis_et_EE.ts
    M i18n/qgis_fa.ts
    M i18n/qgis_fi.ts
    M i18n/qgis_fr.ts
    M i18n/qgis_gl_ES.ts
    M i18n/qgis_he.ts
    M i18n/qgis_hr_HR.ts
    M i18n/qgis_hu.ts
    M i18n/qgis_id.ts
    M i18n/qgis_is.ts
    M i18n/qgis_it.ts
    M i18n/qgis_ja.ts
    M i18n/qgis_ka_GE.ts
    M i18n/qgis_ko_KR.ts
    M i18n/qgis_lo.ts
    M i18n/qgis_lt.ts
    M i18n/qgis_lv.ts
    M i18n/qgis_mn.ts
    M i18n/qgis_nl.ts
    M i18n/qgis_no.ts
    M i18n/qgis_pl_PL.ts
    M i18n/qgis_pt_BR.ts
    M i18n/qgis_pt_PT.ts
    M i18n/qgis_ro.ts
    M i18n/qgis_ru.ts
    M i18n/qgis_sk.ts
    M i18n/qgis_sl_SI.ts
    M i18n/qgis_sq_AL.ts
    M i18n/qgis_sr_CS-Latn.ts
    M i18n/qgis_sv.ts
    M i18n/qgis_ta.ts
    M i18n/qgis_th.ts
    M i18n/qgis_tr.ts
    M i18n/qgis_uk.ts
    M i18n/qgis_vi.ts
    M i18n/qgis_xh.ts
    M i18n/qgis_zh_CN.ts
    M i18n/qgis_zh_TW.ts
    A images/console/iconClassConsole.png
    A images/console/iconClearConsole.png
    A images/console/iconHelpConsole.png
    A images/console/iconIfaceConsole.png
    A images/console/iconOpenConsole.png
    A images/console/iconQtCoreConsole.png
    A images/console/iconQtGuiConsole.png
    A images/console/iconRunConsole.png
    A images/console/iconSaveConsole.png
    A images/console/iconScriptConsole.png
    A images/console/iconSextanteConsole.png
    A images/console/iconTempConsole.png
    A images/console/imgHelpDialog.png
    M images/icons/mac/browser/CMakeLists.txt
    M images/images.qrc
    M mac/extras/1-release-extra.sh
    M mac/extras/2-release-extra-qt.sh
    M mac/extras/3-dmg.sh
    M mac/extras/install-extra.sh
    M mac/extras/release-check.sh
    M mac/extras/release-extra-grass.sh
    M mac/extras/release-extra-py.sh
    M mac/extras/release-extra-qt.sh
    M mac/extras/release-extra.sh
    M mac/extras/release-strip.sh
    M mac/xcode/bundle-template.sh
    M mac/xcode/src/x_python_dummy.cpp
    M ms-windows/QGIS-Installer.nsi
    M ms-windows/QGIS-Packager.bat
    M ms-windows/osgeo4w/package-nightly.cmd
    M ms-windows/osgeo4w/package.cmd
    M ms-windows/quickpackage.sh
    M python/CMakeLists.txt
    M python/__init__.py
    R python/api/CMakeLists.txt
    R python/api/PyQGIS_1.8.api
    R python/api/osgeo_gdal-ogr_1.9.1-1.api
    R python/api/pyqgis_master.pap
    M python/console.py
    A python/console_help.py
    A python/console_help/CMakeLists.txt
    A python/console_help/help.htm
    A python/console_help/i18n/README
    A python/console_help/i18n/de_DE.properties
    A python/console_help/i18n/en_US.properties
    A python/console_help/i18n/it_IT.properties
    A python/console_help/i18n/ru_RU.properties
    A python/console_help/js/encoding.js
    M python/console_sci.py
    A python/core/composer/qgsatlascomposition.sip
    M python/core/composer/qgscomposerlabel.sip
    M python/core/composer/qgscomposition.sip
    M python/core/core.sip
    M python/core/qgsdatasourceuri.sip
    M python/core/qgsexpression.sip
    M python/core/qgspallabeling.sip
    R python/core/qgsrasterdataprovider.sip
    R python/core/qgsrasterprojector.sip
    R python/core/qgsrasterrenderer.sip
    M python/core/raster/qgsmultibandcolorrenderer.sip
    M python/core/raster/qgspaletterasterrenderer.sip
    A python/core/raster/qgsrasterblock.sip
    A python/core/raster/qgsrasterdataprovider.sip
    M python/core/raster/qgsrasterinterface.sip
    M python/core/raster/qgsrasteriterator.sip
    M python/core/raster/qgsrasterlayer.sip
    M python/core/raster/qgsrasternuller.sip
    M python/core/raster/qgsrasterpipe.sip
    A python/core/raster/qgsrasterprojector.sip
    M python/core/raster/qgsrasterrenderer.sip
    M python/core/raster/qgsrasterresamplefilter.sip
    M python/core/raster/qgssinglebandcolordatarenderer.sip
    M python/core/raster/qgssinglebandgrayrenderer.sip
    M python/core/raster/qgssinglebandpseudocolorrenderer.sip
    M python/core/symbology-ng/qgssymbollayerv2.sip
    M python/gui/qgisinterface.sip
    M python/gui/qgsowssourceselect.sip
    M python/gui/raster/qgsrasterminmaxwidget.sip
    M python/gui/raster/qgssinglebandgrayrendererwidget.sip
    M python/gui/raster/qgssinglebandpseudocolorrendererwidget.sip
    M python/gui/symbology-ng/qgssymbollayerv2widget.sip
    R python/help.py
    R python/helpConsole/CMakeLists.txt
    R python/helpConsole/help.htm
    R python/iconConsole/CMakeLists.txt
    R python/iconConsole/iconClassConsole.png
    R python/iconConsole/iconClearConsole.png
    R python/iconConsole/iconHelpConsole.png
    R python/iconConsole/iconIfaceConsole.png
    R python/iconConsole/iconOpenConsole.png
    R python/iconConsole/iconRunConsole.png
    R python/iconConsole/iconSaveConsole.png
    R python/iconConsole/iconScriptConsole.png
    R python/iconConsole/iconSextanteConsole.png
    R python/iconConsole/iconTempConsole.png
    R python/iconConsole/imgHelpDialog.png
    M python/plugins/GdalTools/tools/GdalTools_utils.py
    M python/plugins/GdalTools/tools/dialogBase.py
    M python/plugins/GdalTools/tools/dialogSRS.py
    M python/plugins/GdalTools/tools/doBuildVRT.py
    M python/plugins/GdalTools/tools/doClipper.py
    M python/plugins/GdalTools/tools/doContour.py
    M python/plugins/GdalTools/tools/doDEM.py
    M python/plugins/GdalTools/tools/doExtractProj.py
    M python/plugins/GdalTools/tools/doFillNodata.py
    M python/plugins/GdalTools/tools/doGrid.py
    M python/plugins/GdalTools/tools/doInfo.py
    M python/plugins/GdalTools/tools/doMerge.py
    M python/plugins/GdalTools/tools/doNearBlack.py
    M python/plugins/GdalTools/tools/doOverview.py
    M python/plugins/GdalTools/tools/doPctRgb.py
    M python/plugins/GdalTools/tools/doPolygonize.py
    M python/plugins/GdalTools/tools/doProjection.py
    M python/plugins/GdalTools/tools/doProximity.py
    M python/plugins/GdalTools/tools/doRasterize.py
    M python/plugins/GdalTools/tools/doRgbPct.py
    M python/plugins/GdalTools/tools/doSettings.py
    M python/plugins/GdalTools/tools/doSieve.py
    M python/plugins/GdalTools/tools/doTileIndex.py
    M python/plugins/GdalTools/tools/doTranslate.py
    M python/plugins/GdalTools/tools/doWarp.py
    M python/plugins/GdalTools/tools/extentSelector.py
    M python/plugins/GdalTools/tools/inOutSelector.py
    M python/plugins/GdalTools/tools/optionsTable.py
    M python/plugins/GdalTools/tools/widgetBatchBase.py
    M python/plugins/GdalTools/tools/widgetOverview.ui
    M python/plugins/GdalTools/tools/widgetPluginBase.py
    M python/plugins/db_manager/db_plugins/postgis/plugin.py
    M python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/CMakeLists.txt
    M python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/CMakeLists.txt
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_style.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_left.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_right.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/face_seed.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_left.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/next_right.qml
    A python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/node.qml
    R python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/topoview_template.qgs
    R python/plugins/db_manager/db_plugins/postgis/plugins/versioning/DlgVersioning_ui.py
    M python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
    M python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
    M python/plugins/db_manager/dlg_field_properties.py
    M python/plugins/db_manager/sql_dictionary.py
    M python/plugins/fTools/tools/doMergeShapes.py
    M python/plugins/fTools/tools/ftools_utils.py
    M python/plugins/fTools/tools/voronoi.py
    M python/plugins/mapserver_export/__init__.py
    M python/plugins/mapserver_export/ms_export.py
    M python/plugins/osm/OsmAddRelationDlg.py
    M python/plugins/osm/OsmDatabaseManager.py
    M python/plugins/osm/OsmDownloadDlg.py
    M python/plugins/osm/OsmFeatureDW.py
    M python/plugins/osm/OsmImportDlg.py
    M python/plugins/osm/OsmLoadDlg.py
    M python/plugins/osm/OsmPlugin.py
    M python/plugins/osm/OsmSaveDlg.py
    M python/plugins/osm/OsmTags.py
    M python/plugins/osm/OsmUndoRedoDW.py
    M python/plugins/osm/OsmUploadDlg.py
    M python/plugins/osm/__init__.py
    M python/plugins/osm/map_tools/OsmCreateLineMT.py
    M python/plugins/osm/map_tools/OsmCreatePointMT.py
    M python/plugins/osm/map_tools/OsmCreatePolygonMT.py
    M python/plugins/osm/map_tools/OsmIdentifyMT.py
    M python/plugins/osm/map_tools/OsmMoveMT.py
    M python/plugins/plugin_installer/installer_data.py
    M python/plugins/plugin_installer/installer_gui.py
    A python/plugins/plugin_installer/pluginExperimental.png
    A python/plugins/plugin_installer/pluginStable.png
    M python/plugins/plugin_installer/qgsplugininstallerbase.ui
    M python/plugins/plugin_installer/resources.qrc
    M python/plugins/sextante/CMakeLists.txt
    M python/plugins/sextante/SextantePlugin.py
    M python/plugins/sextante/__init__.py
    M python/plugins/sextante/about/AboutDialog.py
    M python/plugins/sextante/about/CMakeLists.txt
    R python/plugins/sextante/about/about.htm
    A python/plugins/sextante/about/aboutdialogbase.ui
    R python/plugins/sextante/about/sextante_logo.png
    M python/plugins/sextante/algs/AddTableField.py
    M python/plugins/sextante/algs/AutoincrementalField.py
    M python/plugins/sextante/algs/EquivalentNumField.py
    M python/plugins/sextante/algs/Explode.py
    M python/plugins/sextante/algs/FieldPyculator.py
    M python/plugins/sextante/algs/FieldsCalculator.py
    M python/plugins/sextante/algs/SaveSelectedFeatures.py
    M python/plugins/sextante/algs/SextanteAlgorithmProvider.py
    M python/plugins/sextante/algs/SextanteVectorWriter.py
    M python/plugins/sextante/core/AlgorithmProvider.py
    M python/plugins/sextante/core/GeoAlgorithmExecutionException.py
    M python/plugins/sextante/core/LayerExporter.py
    M python/plugins/sextante/core/QGisLayers.py
    M python/plugins/sextante/core/Sextante.py
    M python/plugins/sextante/core/SextanteConfig.py
    M python/plugins/sextante/core/SextanteLog.py
    M python/plugins/sextante/core/SextanteResults.py
    M python/plugins/sextante/core/SextanteUtils.py
    M python/plugins/sextante/core/SextanteVectorWriter.py
    M python/plugins/sextante/core/WrongHelpFileException.py
    R python/plugins/sextante/ftools/BasicStatistics.py
    A python/plugins/sextante/ftools/BasicStatisticsNumbers.py
    A python/plugins/sextante/ftools/BasicStatisticsStrings.py
    M python/plugins/sextante/ftools/Buffer.py
    M python/plugins/sextante/ftools/Centroids.py
    M python/plugins/sextante/ftools/Clip.py
    M python/plugins/sextante/ftools/ConvexHull.py
    M python/plugins/sextante/ftools/Delaunay.py
    A python/plugins/sextante/ftools/DensifyGeometries.py
    M python/plugins/sextante/ftools/Difference.py
    M python/plugins/sextante/ftools/Dissolve.py
    M python/plugins/sextante/ftools/ExportGeometryInfo.py
    M python/plugins/sextante/ftools/ExtentFromLayer.py
    M python/plugins/sextante/ftools/ExtractNodes.py
    M python/plugins/sextante/ftools/FToolsAlgorithmProvider.py
    A python/plugins/sextante/ftools/FToolsUtils.py
    M python/plugins/sextante/ftools/FixedDistanceBuffer.py
    M python/plugins/sextante/ftools/Intersection.py
    R python/plugins/sextante/ftools/LayerFromExtent.py
    M python/plugins/sextante/ftools/LinesIntersection.py
    M python/plugins/sextante/ftools/LinesToPolygons.py
    M python/plugins/sextante/ftools/MeanCoords.py
    M python/plugins/sextante/ftools/MultipartToSingleparts.py
    M python/plugins/sextante/ftools/NearestNeighbourAnalysis.py
    M python/plugins/sextante/ftools/PointDistance.py
    M python/plugins/sextante/ftools/PointsInPolygon.py
    M python/plugins/sextante/ftools/PolygonsToLines.py
    M python/plugins/sextante/ftools/RandomSelection.py
    M python/plugins/sextante/ftools/RandomSelectionWithinSubsets.py
    A python/plugins/sextante/ftools/ReprojectLayer.py
    M python/plugins/sextante/ftools/SelectByLocation.py
    M python/plugins/sextante/ftools/SimplifyGeometries.py
    M python/plugins/sextante/ftools/SinglePartsToMultiparts.py
    M python/plugins/sextante/ftools/SumLines.py
    M python/plugins/sextante/ftools/Union.py
    M python/plugins/sextante/ftools/UniqueValues.py
    M python/plugins/sextante/ftools/VariableDistanceBuffer.py
    M python/plugins/sextante/ftools/VoronoiPolygons.py
    M python/plugins/sextante/ftools/ftools_utils.py
    A python/plugins/sextante/ftools/icons/reproject.png
    M python/plugins/sextante/ftools/voronoi.py
    M python/plugins/sextante/gdal/GdalAlgorithm.py
    M python/plugins/sextante/gdal/GdalAlgorithmProvider.py
    M python/plugins/sextante/gdal/GdalUtils.py
    M python/plugins/sextante/gdal/information.py
    M python/plugins/sextante/gdal/merge.py
    M python/plugins/sextante/gdal/nearblack.py
    M python/plugins/sextante/gdal/pct2rgb.py
    M python/plugins/sextante/gdal/polygonize.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/DefineGrassRegionAction.py
    M python/plugins/sextante/grass/DefineGrassRegionFromLayerAction.py
    M python/plugins/sextante/grass/GrassAlgorithm.py
    M python/plugins/sextante/grass/GrassAlgorithmProvider.py
    M python/plugins/sextante/grass/GrassUtils.py
    M python/plugins/sextante/grass/nviz.py
    M python/plugins/sextante/gui/AlgorithmExecutionDialog.py
    M python/plugins/sextante/gui/AlgorithmExecutor.py
    M python/plugins/sextante/gui/AutofillDialog.py
    M python/plugins/sextante/gui/BatchInputSelectionPanel.py
    M python/plugins/sextante/gui/BatchOutputSelectionPanel.py
    M python/plugins/sextante/gui/BatchProcessingDialog.py
    M python/plugins/sextante/gui/ConfigDialog.py
    M python/plugins/sextante/gui/ContextAction.py
    M python/plugins/sextante/gui/CrsSelectionDialog.py
    M python/plugins/sextante/gui/CrsSelectionPanel.py
    M python/plugins/sextante/gui/EditRenderingStylesDialog.py
    M python/plugins/sextante/gui/ExtentSelectionPanel.py
    M python/plugins/sextante/gui/FileSelectionPanel.py
    M python/plugins/sextante/gui/FixedTableDialog.py
    M python/plugins/sextante/gui/FixedTablePanel.py
    M python/plugins/sextante/gui/Help2Html.py
    M python/plugins/sextante/gui/HelpEditionDialog.py
    M python/plugins/sextante/gui/HistoryDialog.py
    M python/plugins/sextante/gui/InputLayerSelectorPanel.py
    M python/plugins/sextante/gui/MultipleInputDialog.py
    M python/plugins/sextante/gui/MultipleInputPanel.py
    M python/plugins/sextante/gui/NumberInputDialog.py
    M python/plugins/sextante/gui/NumberInputPanel.py
    M python/plugins/sextante/gui/OutputSelectionPanel.py
    M python/plugins/sextante/gui/ParametersDialog.py
    M python/plugins/sextante/gui/ParametersPanel.py
    M python/plugins/sextante/gui/RangePanel.py
    M python/plugins/sextante/gui/RectangleMapTool.py
    M python/plugins/sextante/gui/RenderingStyleFilePanel.py
    M python/plugins/sextante/gui/RenderingStyles.py
    M python/plugins/sextante/gui/ResultsDialog.py
    M python/plugins/sextante/gui/SextantePostprocessing.py
    M python/plugins/sextante/gui/SextanteToolbox.py
    M python/plugins/sextante/gui/ToolboxAction.py
    M python/plugins/sextante/gui/UnthreadedAlgorithmExecutor.py
    A python/plugins/sextante/images/sextante_logo.png
    M python/plugins/sextante/lidar/LidarToolsAlgorithmProvider.py
    M python/plugins/sextante/lidar/fusion/CanopyMaxima.py
    M python/plugins/sextante/lidar/fusion/CanopyModel.py
    M python/plugins/sextante/lidar/fusion/ClipData.py
    M python/plugins/sextante/lidar/fusion/CloudMetrics.py
    M python/plugins/sextante/lidar/fusion/Cover.py
    M python/plugins/sextante/lidar/fusion/DensityMetrics.py
    M python/plugins/sextante/lidar/fusion/FilterData.py
    M python/plugins/sextante/lidar/fusion/FusionAlgorithm.py
    M python/plugins/sextante/lidar/fusion/FusionUtils.py
    M python/plugins/sextante/lidar/fusion/GridMetrics.py
    M python/plugins/sextante/lidar/fusion/GridSurfaceCreate.py
    M python/plugins/sextante/lidar/fusion/GroundFilter.py
    M python/plugins/sextante/lidar/fusion/MergeData.py
    M python/plugins/sextante/lidar/fusion/OpenViewerAction.py
    M python/plugins/sextante/lidar/lastools/LasToolsAlgorithm.py
    M python/plugins/sextante/lidar/lastools/LasToolsUtils.py
    M python/plugins/sextante/lidar/lastools/las2dem.py
    M python/plugins/sextante/lidar/lastools/las2iso.py
    M python/plugins/sextante/lidar/lastools/las2shp.py
    M python/plugins/sextante/lidar/lastools/lasboundary.py
    M python/plugins/sextante/lidar/lastools/lasclassify.py
    M python/plugins/sextante/lidar/lastools/lasclip.py
    M python/plugins/sextante/lidar/lastools/lasgrid.py
    M python/plugins/sextante/lidar/lastools/lasground.py
    M python/plugins/sextante/lidar/lastools/lasheight.py
    M python/plugins/sextante/lidar/lastools/lasinfo.py
    M python/plugins/sextante/lidar/lastools/lasprecision.py
    M python/plugins/sextante/lidar/lastools/lassplit.py
    M python/plugins/sextante/metadata.txt
    M python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py
    M python/plugins/sextante/mmqgisx/mmqgisx_library.py
    M python/plugins/sextante/modeler/CalculatorModelerAlgorithm.py
    M python/plugins/sextante/modeler/CalculatorModelerParametersDialog.py
    M python/plugins/sextante/modeler/CreateNewModelAction.py
    M python/plugins/sextante/modeler/DeleteModelAction.py
    M python/plugins/sextante/modeler/EditModelAction.py
    M python/plugins/sextante/modeler/ModelerAlgorithm.py
    M python/plugins/sextante/modeler/ModelerAlgorithmProvider.py
    M python/plugins/sextante/modeler/ModelerDialog.py
    M python/plugins/sextante/modeler/ModelerGraphicItem.py
    M python/plugins/sextante/modeler/ModelerOnlyAlgorithmProvider.py
    M python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py
    M python/plugins/sextante/modeler/ModelerParametersDialog.py
    M python/plugins/sextante/modeler/ModelerScene.py
    M python/plugins/sextante/modeler/ModelerUtils.py
    M python/plugins/sextante/modeler/Providers.py
    M python/plugins/sextante/modeler/WrongModelException.py
    M python/plugins/sextante/otb/OTBAlgorithm.py
    M python/plugins/sextante/otb/OTBAlgorithmProvider.py
    M python/plugins/sextante/otb/OTBUtils.py
    M python/plugins/sextante/otb/helper/generate_application_descriptors.py
    M python/plugins/sextante/outputs/Output.py
    M python/plugins/sextante/outputs/OutputFactory.py
    M python/plugins/sextante/outputs/OutputFile.py
    M python/plugins/sextante/outputs/OutputHTML.py
    M python/plugins/sextante/outputs/OutputNumber.py
    M python/plugins/sextante/outputs/OutputRaster.py
    M python/plugins/sextante/outputs/OutputTable.py
    M python/plugins/sextante/outputs/OutputVector.py
    M python/plugins/sextante/parameters/Parameter.py
    M python/plugins/sextante/parameters/ParameterBoolean.py
    M python/plugins/sextante/parameters/ParameterCrs.py
    M python/plugins/sextante/parameters/ParameterDataObject.py
    M python/plugins/sextante/parameters/ParameterExtent.py
    M python/plugins/sextante/parameters/ParameterFactory.py
    M python/plugins/sextante/parameters/ParameterFile.py
    M python/plugins/sextante/parameters/ParameterFixedTable.py
    M python/plugins/sextante/parameters/ParameterMultipleInput.py
    M python/plugins/sextante/parameters/ParameterNumber.py
    M python/plugins/sextante/parameters/ParameterRange.py
    M python/plugins/sextante/parameters/ParameterRaster.py
    M python/plugins/sextante/parameters/ParameterSelection.py
    M python/plugins/sextante/parameters/ParameterString.py
    M python/plugins/sextante/parameters/ParameterTable.py
    M python/plugins/sextante/parameters/ParameterTableField.py
    M python/plugins/sextante/parameters/ParameterVector.py
    M python/plugins/sextante/pymorph/AlgNames.py
    M python/plugins/sextante/pymorph/PymorphAlgorithm.py
    M python/plugins/sextante/pymorph/PymorphAlgorithmProvider.py
    M python/plugins/sextante/pymorph/__init__.py
    M python/plugins/sextante/pymorph/compat.py
    M python/plugins/sextante/pymorph/mmorph.py
    M python/plugins/sextante/pymorph/notimplemented.py
    M python/plugins/sextante/pymorph/pymorph_version.py
    M python/plugins/sextante/pymorph/scripts/add4dilate.py
    M python/plugins/sextante/pymorph/scripts/addm.py
    M python/plugins/sextante/pymorph/scripts/areaclose.py
    M python/plugins/sextante/pymorph/scripts/areaopen.py
    M python/plugins/sextante/pymorph/scripts/asf.py
    M python/plugins/sextante/pymorph/scripts/asfrec.py
    M python/plugins/sextante/pymorph/scripts/binary.py
    M python/plugins/sextante/pymorph/scripts/cbisector.py
    M python/plugins/sextante/pymorph/scripts/cdilate.py
    M python/plugins/sextante/pymorph/scripts/center.py
    M python/plugins/sextante/pymorph/scripts/cerode.py
    M python/plugins/sextante/pymorph/scripts/close.py
    M python/plugins/sextante/pymorph/scripts/closeholes.py
    M python/plugins/sextante/pymorph/scripts/closerec.py
    M python/plugins/sextante/pymorph/scripts/closerecth.py
    M python/plugins/sextante/pymorph/scripts/closeth.py
    M python/plugins/sextante/pymorph/scripts/cthick.py
    M python/plugins/sextante/pymorph/scripts/cthin.py
    M python/plugins/sextante/pymorph/scripts/cwatershed.py
    M python/plugins/sextante/pymorph/scripts/dilate.py
    M python/plugins/sextante/pymorph/scripts/dist.py
    M python/plugins/sextante/pymorph/scripts/erode.py
    M python/plugins/sextante/pymorph/scripts/gdist.py
    M python/plugins/sextante/pymorph/scripts/gradm.py
    M python/plugins/sextante/pymorph/scripts/hmax.py
    M python/plugins/sextante/pymorph/scripts/hmin.py
    M python/plugins/sextante/pymorph/scripts/inpos.py
    M python/plugins/sextante/pymorph/scripts/isolines.py
    M python/plugins/sextante/pymorph/scripts/label.py
    M python/plugins/sextante/pymorph/scripts/labelflat.py
    M python/plugins/sextante/pymorph/scripts/lastero.py
    M python/plugins/sextante/pymorph/scripts/neg.py
    M python/plugins/sextante/pymorph/scripts/openrec.py
    M python/plugins/sextante/pymorph/scripts/openrecth.py
    M python/plugins/sextante/pymorph/scripts/openth.py
    M python/plugins/sextante/pymorph/scripts/opentransf.py
    M python/plugins/sextante/pymorph/scripts/patspec.py
    M python/plugins/sextante/pymorph/scripts/randomcolor.py
    M python/plugins/sextante/pymorph/scripts/regmax.py
    M python/plugins/sextante/pymorph/scripts/regmin.py
    M python/plugins/sextante/pymorph/scripts/skelm.py
    M python/plugins/sextante/pymorph/scripts/skelmrec.py
    M python/plugins/sextante/pymorph/scripts/skiz.py
    M python/plugins/sextante/pymorph/scripts/subm.py
    M python/plugins/sextante/pymorph/scripts/suprec.py
    M python/plugins/sextante/pymorph/scripts/symdiff.py
    M python/plugins/sextante/pymorph/scripts/thick.py
    M python/plugins/sextante/pymorph/scripts/thin.py
    M python/plugins/sextante/pymorph/scripts/toggle.py
    M python/plugins/sextante/pymorph/scripts/watershed.py
    M python/plugins/sextante/pymorph/text.py
    M python/plugins/sextante/r/CreateNewRScriptAction.py
    M python/plugins/sextante/r/EditRScriptAction.py
    M python/plugins/sextante/r/EditRScriptDialog.py
    M python/plugins/sextante/r/RAlgorithm.py
    M python/plugins/sextante/r/RAlgorithmProvider.py
    M python/plugins/sextante/r/RUtils.py
    A python/plugins/sextante/resources.qrc
    M python/plugins/sextante/saga/SagaAlgorithm.py
    M python/plugins/sextante/saga/SagaAlgorithmProvider.py
    M python/plugins/sextante/saga/SagaDescriptionCreator.py
    M python/plugins/sextante/saga/SagaGroupNameDecorator.py
    M python/plugins/sextante/saga/SagaHelpGenerator.py
    M python/plugins/sextante/saga/SagaUtils.py
    M python/plugins/sextante/script/CreateNewScriptAction.py
    M python/plugins/sextante/script/DeleteScriptAction.py
    M python/plugins/sextante/script/EditScriptAction.py
    M python/plugins/sextante/script/EditScriptDialog.py
    M python/plugins/sextante/script/ScriptAlgorithm.py
    M python/plugins/sextante/script/ScriptAlgorithmProvider.py
    M python/plugins/sextante/script/ScriptUtils.py
    M python/plugins/sextante/script/WrongScriptException.py
    M python/plugins/sextante/tests/runtests.sh
    M python/plugins/sextante/tests/utilities_test.py
    M python/plugins/sextanteexampleprovider/ExampleAlgorithm.py
    M python/plugins/sextanteexampleprovider/ExampleAlgorithmProvider.py
    M python/plugins/sextanteexampleprovider/SextanteExampleProviderPlugin.py
    M python/plugins/sextanteexampleprovider/__init__.py
    M python/pyspatialite/lib/dump.py
    A python/qsci_apis/CMakeLists.txt
    A python/qsci_apis/OSGeo_GDAL-OGR-1.9.1.api
    A python/qsci_apis/PyQGIS-1.7.api
    A python/qsci_apis/PyQGIS-1.8.api
    A python/qsci_apis/PyQt4-4.7.4.api
    A python/qsci_apis/Python-2.5.api
    A python/qsci_apis/Python-2.6.api
    A python/qsci_apis/Python-2.7.api
    A python/qsci_apis/QScintilla2-2.4.5.api
    A python/qsci_apis/pyqgis_master.pap
    M python/utils.py
    M python/widgets_tree.py
    M resources/CMakeLists.txt
    A resources/function_help/$feature-en_US
    A resources/function_help/$numfeatures-en_US
    A resources/function_help/$numpages-en_US
    A resources/function_help/$page-en_US
    A resources/jQuery/jquery-1.8.2.min.js
    A resources/jQuery/jquery.i18n.min.js
    M scripts/addcopyright.sh
    M scripts/astyle-all.sh
    M scripts/astyle-rollback.sh
    M scripts/astyle.sh
    M scripts/build_debian_package.sh
    A scripts/chkcopyrights.sh
    M scripts/chkspelling.sh
    M scripts/chstroke.sh
    M scripts/create_new_ts.sh
    M scripts/fixdiff.pl
    M scripts/make-tarball.sh
    M scripts/make_gource_video.sh
    M scripts/prepare-commit.sh
    M scripts/qgis_srs.sh
    M scripts/qgm2cpp.pl
    M scripts/qgsloggermig.pl
    M scripts/remove_git_confict_files.sh
    M scripts/remove_non_svn_files.sh
    M scripts/scandeps.pl
    M scripts/ts2cpp.pl
    M scripts/tsstat.pl
    M scripts/update-indent.sh
    M scripts/update_ts_files.sh
    M src/app/CMakeLists.txt
    A src/app/composer/qgsatlascompositionwidget.cpp
    A src/app/composer/qgsatlascompositionwidget.h
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscomposerhtmlwidget.cpp
    M src/app/composer/qgscomposerhtmlwidget.h
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/app/composer/qgscomposerlabelwidget.h
    M src/app/composer/qgscomposerlegendlayersdialog.cpp
    M src/app/composer/qgscomposerlegendlayersdialog.h
    M src/app/composer/qgscomposerlegendwidget.cpp
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/app/legend/qgslegend.cpp
    M src/app/legend/qgslegendgroup.cpp
    M src/app/legend/qgslegendgroup.h
    M src/app/legend/qgslegenditem.cpp
    M src/app/legend/qgslegenditem.h
    M src/app/legend/qgslegendlayer.cpp
    M src/app/legend/qgslegendlayer.h
    M src/app/legend/qgslegendpropertygroup.cpp
    M src/app/legend/qgslegendpropertygroup.h
    M src/app/legend/qgslegendpropertyitem.cpp
    M src/app/legend/qgslegendpropertyitem.h
    M src/app/legend/qgslegendsymbologygroup.cpp
    M src/app/legend/qgslegendsymbologygroup.h
    M src/app/legend/qgslegendsymbologyitem.cpp
    M src/app/legend/qgslegendsymbologyitem.h
    M src/app/nodetool/qgsselectedfeature.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsattributetypedialog.cpp
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsdecorationgriddialog.cpp
    M src/app/qgsidentifyresults.cpp
    M src/app/qgsidentifyresults.h
    M src/app/qgslabeldialog.cpp
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/app/qgsmaptoolrotatelabel.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/app/qgsrasterlayerproperties.cpp
    M src/app/qgssnappingdialog.cpp
    M src/app/qgssnappingdialog.h
    M src/app/qgstip.h
    M src/app/qgsundowidget.cpp
    M src/app/qgsundowidget.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/core/CMakeLists.txt
    A src/core/composer/qgsatlascomposition.cpp
    A src/core/composer/qgsatlascomposition.h
    M src/core/composer/qgscomposerhtml.cpp
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposerlabel.cpp
    M src/core/composer/qgscomposerlabel.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/core/gps/config.h
    M src/core/gps/context.c
    M src/core/gps/context.h
    M src/core/gps/gmath.c
    M src/core/gps/gmath.h
    M src/core/gps/info.c
    M src/core/gps/info.h
    M src/core/gps/nmeatime.h
    M src/core/gps/parse.c
    M src/core/gps/parse.h
    M src/core/gps/parser.h
    M src/core/gps/sentence.c
    M src/core/gps/time.c
    M src/core/gps/tok.c
    M src/core/gps/tok.h
    M src/core/gps/units.h
    M src/core/pal/costcalculator.cpp
    M src/core/pal/costcalculator.h
    M src/core/pal/feature.h
    M src/core/pal/labelposition.cpp
    M src/core/pal/layer.h
    M src/core/qgis.cpp
    M src/core/qgis.h
    M src/core/qgsbrowsermodel.cpp
    M src/core/qgsbrowsermodel.h
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgsexpressionparser.yy
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsmaprenderer.h
    M src/core/qgsmimedatautils.cpp
    M src/core/qgsmimedatautils.h
    M src/core/qgsnetworkaccessmanager.cpp
    M src/core/qgsnetworkaccessmanager.h
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/core/qgspluginlayer.cpp
    M src/core/qgspluginlayer.h
    M src/core/qgsprojectfiletransform.cpp
    M src/core/qgspythonrunner.cpp
    M src/core/qgspythonrunner.h
    R src/core/qgsrasterdataprovider.cpp
    R src/core/qgsrasterdataprovider.h
    R src/core/qgsrasterprojector.cpp
    R src/core/qgsrasterprojector.h
    M src/core/qgsrendercontext.cpp
    M src/core/qgsvectorfilewriter.cpp
    M src/core/qgsvectorlayerundocommand.cpp
    M src/core/qgsvectorlayerundocommand.h
    M src/core/raster/qgsbilinearrasterresampler.h
    M src/core/raster/qgscubicrasterresampler.h
    M src/core/raster/qgsmultibandcolorrenderer.cpp
    M src/core/raster/qgsmultibandcolorrenderer.h
    M src/core/raster/qgspalettedrasterrenderer.cpp
    M src/core/raster/qgspalettedrasterrenderer.h
    A src/core/raster/qgsrasterblock.cpp
    A src/core/raster/qgsrasterblock.h
    M src/core/raster/qgsrasterchecker.cpp
    A src/core/raster/qgsrasterdataprovider.cpp
    A src/core/raster/qgsrasterdataprovider.h
    M src/core/raster/qgsrasterdrawer.cpp
    M src/core/raster/qgsrasterdrawer.h
    M src/core/raster/qgsrasterfilewriter.cpp
    M src/core/raster/qgsrasterfilewriter.h
    M src/core/raster/qgsrasterinterface.cpp
    M src/core/raster/qgsrasterinterface.h
    M src/core/raster/qgsrasteriterator.cpp
    M src/core/raster/qgsrasteriterator.h
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterlayer.h
    M src/core/raster/qgsrasternuller.cpp
    M src/core/raster/qgsrasternuller.h
    M src/core/raster/qgsrasterpipe.h
    A src/core/raster/qgsrasterprojector.cpp
    A src/core/raster/qgsrasterprojector.h
    M src/core/raster/qgsrasterrenderer.cpp
    M src/core/raster/qgsrasterrenderer.h
    M src/core/raster/qgsrasterrendererregistry.h
    M src/core/raster/qgsrasterresamplefilter.cpp
    M src/core/raster/qgsrasterresamplefilter.h
    M src/core/raster/qgsrasterresampler.h
    M src/core/raster/qgsrastertransparency.cpp
    M src/core/raster/qgssinglebandcolordatarenderer.cpp
    M src/core/raster/qgssinglebandcolordatarenderer.h
    M src/core/raster/qgssinglebandgrayrenderer.cpp
    M src/core/raster/qgssinglebandgrayrenderer.h
    M src/core/raster/qgssinglebandpseudocolorrenderer.cpp
    M src/core/raster/qgssinglebandpseudocolorrenderer.h
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgscolorbrewerpalette.cpp
    M src/core/symbology-ng/qgscolorbrewerpalette.h
    M src/core/symbology-ng/qgsfillsymbollayerv2.cpp
    M src/core/symbology-ng/qgsfillsymbollayerv2.h
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
    M src/core/symbology-ng/qgslinesymbollayerv2.cpp
    M src/core/symbology-ng/qgslinesymbollayerv2.h
    M src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
    M src/core/symbology-ng/qgsmarkersymbollayerv2.h
    M src/core/symbology-ng/qgsrendererv2.cpp
    M src/core/symbology-ng/qgsrendererv2.h
    M src/core/symbology-ng/qgsrendererv2registry.cpp
    M src/core/symbology-ng/qgsrendererv2registry.h
    M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
    M src/core/symbology-ng/qgsrulebasedrendererv2.h
    M src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
    M src/core/symbology-ng/qgssinglesymbolrendererv2.h
    M src/core/symbology-ng/qgsstylev2.cpp
    M src/core/symbology-ng/qgsstylev2.h
    M src/core/symbology-ng/qgssymbollayerv2.cpp
    M src/core/symbology-ng/qgssymbollayerv2.h
    M src/core/symbology-ng/qgssymbollayerv2registry.cpp
    M src/core/symbology-ng/qgssymbollayerv2registry.h
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.h
    M src/core/symbology-ng/qgssymbologyv2conversion.cpp
    M src/core/symbology-ng/qgssymbologyv2conversion.h
    M src/core/symbology-ng/qgssymbolv2.cpp
    M src/core/symbology-ng/qgssymbolv2.h
    M src/core/symbology-ng/qgsvectorcolorrampv2.cpp
    M src/core/symbology-ng/qgsvectorcolorrampv2.h
    M src/gui/qgisinterface.h
    M src/gui/qgsattributeeditor.cpp
    M src/gui/qgscomposerview.cpp
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/gui/qgsmapcanvassnapper.cpp
    M src/gui/qgsowssourceselect.cpp
    M src/gui/qgsowssourceselect.h
    M src/gui/qgsprojectbadlayerguihandler.cpp
    M src/gui/qgsprojectbadlayerguihandler.h
    M src/gui/qgsrasterlayersaveasdialog.cpp
    M src/gui/qgsrasterlayersaveasdialog.h
    M src/gui/qgsscalecombobox.cpp
    M src/gui/qgssearchquerybuilder.cpp
    M src/gui/raster/qgsrasterhistogramwidget.cpp
    M src/gui/raster/qgsrasterminmaxwidget.cpp
    M src/gui/raster/qgsrasterminmaxwidget.h
    M src/gui/raster/qgssinglebandgrayrendererwidget.cpp
    M src/gui/raster/qgssinglebandgrayrendererwidget.h
    M src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
    M src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
    M src/gui/symbology-ng/qgsbrushstylecombobox.cpp
    M src/gui/symbology-ng/qgsbrushstylecombobox.h
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgscolorrampcombobox.cpp
    M src/gui/symbology-ng/qgscolorrampcombobox.h
    M src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
    M src/gui/symbology-ng/qgspenstylecombobox.cpp
    M src/gui/symbology-ng/qgspenstylecombobox.h
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
    M src/gui/symbology-ng/qgsrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrendererv2widget.h
    M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
    M src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
    M src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
    M src/gui/symbology-ng/qgsstylev2managerdialog.cpp
    M src/gui/symbology-ng/qgsstylev2managerdialog.h
    M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.h
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.h
    M src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
    M src/gui/symbology-ng/qgssymbolv2selectordialog.h
    M src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
    M src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h
    M src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
    M src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h
    M src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
    M src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h
    M src/mapserver/qgis_map_serv.cpp
    M src/mapserver/qgsconfigparser.h
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsprojectparser.h
    M src/mapserver/qgssldparser.cpp
    M src/mapserver/qgssldparser.h
    M src/mapserver/qgswfsserver.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/mapserver/qgswmsserver.h
    M src/plugins/CMakeLists.txt
    M src/plugins/diagram_overlay/CMakeLists.txt
    R src/plugins/diagram_overlay/qgsdiagramdialog.cpp
    R src/plugins/diagram_overlay/qgsdiagramdialog.h
    R src/plugins/diagram_overlay/qgsdiagramdialogbase.ui
    R src/plugins/diagram_overlay/qgsdiagramfactorywidget.cpp
    R src/plugins/diagram_overlay/qgsdiagramfactorywidget.h
    M src/plugins/diagram_overlay/qgsdiagramoverlayplugin.cpp
    M src/plugins/diagram_overlay/qgsdiagramoverlayplugin.h
    R src/plugins/diagram_overlay/qgsdiagramrendererwidget.cpp
    R src/plugins/diagram_overlay/qgsdiagramrendererwidget.h
    R src/plugins/diagram_overlay/qgslinearlyscalingdialog.cpp
    R src/plugins/diagram_overlay/qgslinearlyscalingdialog.h
    R src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
    R src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
    R src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.h
    R src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
    R src/plugins/diagram_overlay/qgswkndiagramfactorywidget.cpp
    R src/plugins/diagram_overlay/qgswkndiagramfactorywidget.h
    R src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
    M src/plugins/dxf2shp_converter/getInsertions.cpp
    M src/plugins/dxf2shp_converter/getInsertions.h
    M src/plugins/globe/CMakeLists.txt
    M src/plugins/globe/CMakeModules/FindOSG.cmake
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0000/0000_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0001/0001_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0002/0002_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0003/0003_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0004/0004_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0005/0005_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0006/0006_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0007/0007_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0008/0008_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0009/0009_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0010/0010_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0011/0011_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0012/0012_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0013/0013_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0014/0014_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0015/0015_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0016/0016_0008.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0000.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0001.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0002.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0003.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0004.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0005.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0006.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0007.bil
    R src/plugins/globe/data/worldwind_srtm/0/0017/0017_0008.bil
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/globe/globe_plugin.h
    M src/plugins/globe/globe_plugin_dialog.cpp
    M src/plugins/globe/globe_plugin_dialog.h
    M src/plugins/globe/globe_plugin_dialog_guibase.ui
    A src/plugins/globe/osgEarthQt/Common
    A src/plugins/globe/osgEarthQt/ViewerWidget
    A src/plugins/globe/osgEarthQt/ViewerWidget.cpp
    A src/plugins/globe/osgEarthUtil/Controls
    A src/plugins/globe/osgEarthUtil/Controls.cpp
    M src/plugins/globe/qgsosgearthtilesource.cpp
    R src/plugins/globe/qgsosgviewer.cpp
    R src/plugins/globe/qgsosgviewer.h
    M src/plugins/grass/modules/v.centroids.qgm
    M src/plugins/grass/qtermwidget/ColorTables.h
    M src/plugins/grass/qtermwidget/konsole_wcwidth.h
    M src/plugins/grass/scripts/db.connect-login.pg.py
    M src/plugins/grass/scripts/qgis.v.kernel.rast.py
    M src/plugins/grass/scripts/r.external.all.py
    M src/plugins/grass/scripts/v.out.ogr.pg.py
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdaldataitems.h
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/gdal/qgsgdalprovider.h
    M src/providers/gdal/qgsgdalproviderbase.cpp
    M src/providers/gdal/qgsgdalproviderbase.h
    M src/providers/grass/qgsgrassrasterprovider.cpp
    M src/providers/grass/qgsgrassrasterprovider.h
    M src/providers/memory/qgsmemoryprovider.cpp
    M src/providers/memory/qgsmemoryprovider.h
    M src/providers/ows/qgsowsdataitems.cpp
    M src/providers/ows/qgsowsdataitems.h
    M src/providers/postgres/qgspostgresconn.cpp
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresdataitems.h
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/providers/spatialite/qgsspatialiteconnection.cpp
    M src/providers/spatialite/qgsspatialiteconnection.h
    M src/providers/spatialite/qgsspatialitedataitems.cpp
    M src/providers/spatialite/qgsspatialitedataitems.h
    M src/providers/wcs/qgswcscapabilities.cpp
    M src/providers/wcs/qgswcscapabilities.h
    M src/providers/wcs/qgswcsprovider.cpp
    M src/providers/wcs/qgswcsprovider.h
    M src/providers/wcs/qgswcssourceselect.cpp
    M src/providers/wfs/qgswfscapabilities.cpp
    M src/providers/wfs/qgswfscapabilities.h
    M src/providers/wfs/qgswfsdata.cpp
    M src/providers/wfs/qgswfsdataitems.cpp
    M src/providers/wfs/qgswfsdataitems.h
    M src/providers/wfs/qgswfsprovider.cpp
    M src/providers/wfs/qgswfsprovider.h
    M src/providers/wfs/qgswfsutils.cpp
    M src/providers/wfs/qgswfsutils.h
    M src/providers/wms/qgswmsdataitems.cpp
    M src/providers/wms/qgswmsdataitems.h
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgisapp.ui
    A src/ui/qgsatlascompositionwidgetbase.ui
    M src/ui/qgsattributetypeedit.ui
    M src/ui/qgscomposeritemwidgetbase.ui
    M src/ui/qgscomposerlabelwidgetbase.ui
    M src/ui/qgscomposerlegendwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M src/ui/qgslabelingguibase.ui
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgsowssourceselectbase.ui
    M src/ui/qgsprojectpropertiesbase.ui
    M src/ui/qgsrasterlayerpropertiesbase.ui
    M src/ui/qgsrasterminmaxwidgetbase.ui
    M src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
    M src/ui/qgssnappingdialogbase.ui
    M src/ui/symbollayer/widget_ellipse.ui
    M src/ui/symbollayer/widget_fontmarker.ui
    M src/ui/symbollayer/widget_linedecoration.ui
    M src/ui/symbollayer/widget_linepatternfill.ui
    M src/ui/symbollayer/widget_pointpatternfill.ui
    M src/ui/symbollayer/widget_simplefill.ui
    M src/ui/symbollayer/widget_simpleline.ui
    M src/ui/symbollayer/widget_simplemarker.ui
    M src/ui/symbollayer/widget_svgfill.ui
    M src/ui/symbollayer/widget_svgmarker.ui
    M tests/ctest2junix.xsl
    M tests/src/core/CMakeLists.txt
    A tests/src/core/testqgsatlascomposition.cpp
    A tests/src/core/testqgscomposerlabel.cpp
    M tests/src/core/testqgscomposermap.cpp
    M tests/src/core/testqgscomposerscalebar.cpp
    M tests/src/core/testqgsexpression.cpp
    M tests/src/gui/testrendererv2gui.cpp
    M tests/src/gui/testrendererv2gui.h
    M tests/src/providers/testqgswcspublicservers.cpp
    M tests/src/python/CMakeLists.txt
    M tests/src/python/qgscompositionchecker.py
    R tests/src/python/test_qgisapp.py
    A tests/src/python/test_qgsapplication.py
    A tests/src/python/test_qgsatlascomposition.py
    M tests/src/python/test_qgscomposerhtml.py
    A tests/src/python/test_qgscomposerlabel.py
    M tests/src/python/test_qgscomposermap.py
    M tests/src/python/test_qgscomposition.py
    M tests/src/python/test_qgscoordinatetransform.py
    M tests/src/python/test_qgsgeometry.py
    M tests/src/python/test_qgslogger.py
    M tests/src/python/test_qgsmemoryprovider.py
    A tests/src/python/test_qgspoint.py
    M tests/src/python/test_qgsrasterfilewriter.py
    M tests/src/python/test_qgsrasterlayer.py
    M tests/src/python/test_qgsrectangle.py
    M tests/src/python/test_qgsspatialindex.py
    M tests/src/python/test_qgssymbollayerv2.py
    M tests/src/python/test_qgsvectorlayer.py
    M tests/src/python/utilities.py
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
    M tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
    M tests/testdata/control_images/expected_composermap/composermap_landsat_overview.png
    A tests/testdata/control_images/expected_composermap/composermap_zebra_style.png
    A tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
    A tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
    A tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
    A tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
    A tests/testdata/control_images/expected_composermapatlas/hiding_0.png
    A tests/testdata/control_images/expected_composermapatlas/hiding_1.png
    A tests/testdata/france_parts.dbf
    A tests/testdata/france_parts.prj
    A tests/testdata/france_parts.qpj
    A tests/testdata/france_parts.shp
    A tests/testdata/france_parts.shx
    A tests/testdata/wkt/simplify_error.wkt
    M tools/qgis-qt3to4.pl

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


Compare: https://github.com/qgis/Quantum-GIS/compare/036d844fc58b...5df9bc36e778


More information about the QGIS-commit mailing list