[QGIS Commit] [qgis/QGIS] a563f2: WMS Tile retry feature

GitHub noreply at github.com
Tue Oct 15 09:11:30 PDT 2013 

  Branch: refs/heads/master
  Home:   https://github.com/qgis/QGIS
  Commit: a563f2a650b13db9a1d7d58983ac2a2f5b87f1bb
      https://github.com/qgis/QGIS/commit/a563f2a650b13db9a1d7d58983ac2a2f5b87f1bb
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  WMS Tile retry feature


  Commit: 3e278110f298bdf9363a936dd296b75b84858e6c
      https://github.com/qgis/QGIS/commit/3e278110f298bdf9363a936dd296b75b84858e6c
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M src/providers/wms/qgswmsprovider.cpp

  Log Message:
  -----------
  better message logging for WMS retry


  Commit: 6b2fa67442a9035f98ab27edb7dacea753d089c5
      https://github.com/qgis/QGIS/commit/6b2fa67442a9035f98ab27edb7dacea753d089c5
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    R Doxyfile
    M cmake_templates/Doxyfile.in
    M debian/rules
    M doc/TRANSLATORS
    M i18n/qgis_af.ts
    M i18n/qgis_ar.ts
    M i18n/qgis_bg.ts
    M i18n/qgis_bn.ts
    M i18n/qgis_bs_BA.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_en.ts
    M i18n/qgis_es.ts
    M i18n/qgis_et_EE.ts
    M i18n/qgis_eu.ts
    M i18n/qgis_fa.ts
    M i18n/qgis_fi.ts
    M i18n/qgis_fr.ts
    M i18n/qgis_gl.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_km.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_ml_IN.ts
    M i18n/qgis_mn.ts
    M i18n/qgis_nb_NO.ts
    M i18n/qgis_nl.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_Cyrl.ts
    M i18n/qgis_sr_Latn.ts
    M i18n/qgis_sv.ts
    M i18n/qgis_sw.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
    M images/images.qrc
    A images/themes/default/console/iconProcessingConsole.png
    R images/themes/default/console/iconSextanteConsole.png
    M ms-windows/QGIS-Installer.nsi
    M ms-windows/osgeo4w/creatensis.pl
    M ms-windows/osgeo4w/package-nightly64.cmd
    M python/console/console.py
    M python/console/console_editor.py
    M python/console/console_sci.py
    M python/console/console_settings.py
    M python/core/symbology-ng/qgslinesymbollayerv2.sip
    M python/core/symbology-ng/qgssymbollayerv2.sip
    M python/gui/symbology-ng/qgssymbollayerv2widget.sip
    M python/plugins/db_manager/db_model.py
    M python/plugins/db_manager/layer_preview.py
    M python/plugins/fTools/tools/doPointDistance.py
    M python/plugins/processing/algs/ftools/FixedDistanceBuffer.py
    M python/plugins/processing/core/GeoAlgorithm.py
    M python/plugins/processing/core/ProcessingConfig.py
    M python/plugins/processing/exampleprovider/ExampleAlgorithm.py
    M python/plugins/processing/exampleprovider/ExampleAlgorithmProvider.py
    A python/plugins/processing/exampleprovider/ProcessingExampleProviderPlugin.py
    R python/plugins/processing/exampleprovider/SextanteExampleProviderPlugin.py
    M python/plugins/processing/exampleprovider/metadata.txt
    M python/plugins/processing/gui/CouldNotLoadResultsDialog.py
    M python/plugins/processing/gui/MissingDependencyDialog.py
    M python/plugins/processing/gui/ProcessingToolbox.py
    R python/plugins/processing/images/toolbox.png
    M python/plugins/processing/modeler/CalculatorModelerParametersDialog.py
    M python/plugins/processing/modeler/ModelerAlgorithm.py
    M python/plugins/processing/modeler/ModelerDialog.py
    M python/plugins/processing/parameters/ParameterTableField.py
    M python/plugins/processing/saga/SagaAlgorithm.py
    M python/plugins/processing/saga/SagaAlgorithmProvider.py
    M python/plugins/processing/saga/SagaUtils.py
    A python/plugins/processing/saga/description/2.0.8_ShapesBuffer.txt
    A python/plugins/processing/saga/description/2.1_ShapesBuffer.txt
    M python/plugins/processing/saga/description/CatchmentArea(Mass-FluxMethod).txt
    R python/plugins/processing/saga/description/ShapesBuffer.txt
    M python/plugins/processing/saga/description/SplitShapesLayerRandomly.txt
    R python/plugins/processing/saga/description/ThiessenPolygons.txt
    M python/plugins/processing/saga/ext/supervisedclassification.py
    M resources/context_help/HeatmapGui
    R resources/context_help/MapServerExport
    M resources/context_help/PythonConsole
    M resources/function_help/ceil
    M resources/function_help/floor
    M resources/function_help/ln
    M resources/function_help/toint
    M resources/function_help/toreal
    M resources/function_help/tostring
    M resources/function_help/xat
    M resources/function_help/yat
    M src/app/CMakeLists.txt
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgsabout.cpp
    M src/app/qgsmaptooladdfeature.cpp
    M src/app/qgsmaptooladdpart.cpp
    M src/app/qgsmaptooladdring.cpp
    M src/app/qgsmaptooledit.h
    M src/app/qgsmaptoollabel.cpp
    M src/app/qgsmaptoolmovefeature.cpp
    M src/app/qgsmaptoolreshape.cpp
    M src/app/qgsmaptoolrotatefeature.cpp
    M src/app/qgsmaptoolrotatelabel.cpp
    M src/app/qgsmaptoolsimplify.cpp
    M src/app/qgsnewspatialitelayerdialog.cpp
    M src/app/qgsoptions.cpp
    M src/app/qgsprojectproperties.cpp
    M src/core/composer/qgslegendmodel.cpp
    M src/core/qgsmaprenderer.cpp
    M src/core/qgspallabeling.cpp
    M src/core/qgsvectorfilewriter.cpp
    M src/core/qgsvectorlayerfeatureiterator.cpp
    M src/core/raster/qgsrasterlayer.cpp
    M src/core/raster/qgsrasterrenderer.cpp
    M src/core/symbology-ng/qgslinesymbollayerv2.cpp
    M src/core/symbology-ng/qgslinesymbollayerv2.h
    M src/core/symbology-ng/qgssymbollayerv2registry.cpp
    M src/gui/attributetable/qgsdualview.cpp
    M src/gui/attributetable/qgsdualview.h
    M src/gui/attributetable/qgsfeaturelistview.h
    M src/gui/qgsattributedialog.cpp
    M src/gui/qgsformannotationitem.cpp
    M src/gui/qgsmessagebaritem.cpp
    M src/gui/qgsnewvectorlayerdialog.cpp
    M src/gui/symbology-ng/qgslayerpropertieswidget.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.h
    M src/mapserver/CMakeLists.txt
    M src/mapserver/qgis_map_serv.cpp
    M src/plugins/coordinate_capture/coordinatecapture.cpp
    M src/plugins/coordinate_capture/coordinatecapture.h
    M src/plugins/roadgraph/shortestpathwidget.cpp
    M src/plugins/spit/qgsshapefile.cpp
    M src/plugins/topology/checkDock.cpp
    M src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
    M src/providers/grass/qgsgrass.cpp
    M src/providers/ogr/qgsogrfeatureiterator.cpp
    M src/providers/ogr/qgsogrprovider.cpp
    M src/providers/ogr/qgsogrprovider.h
    R src/ui/symbollayer/widget_linedecoration.ui
    M tests/src/python/CMakeLists.txt
    A tests/src/python/qgis_local_server.py
    M tests/src/python/test_qgsissue7244.py
    M tests/src/python/test_qgspallabeling_base.py
    M tests/src/python/test_qgspallabeling_canvas.py
    A tests/src/python/test_qgspallabeling_server.py
    M tests/src/python/test_qgspallabeling_tests.py
    M tests/src/python/test_qgsspatialiteprovider.py
    M tests/src/python/test_qgssymbollayerv2.py
    M tests/src/python/utilities.py
    M tests/testdata/control_images/expected_pal_canvas/sp_default_label/sp_default_label.PNGw
    M tests/testdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color.PNGw
    M tests/testdata/control_images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit.PNGw
    A tests/testdata/control_images/expected_pal_server/sp_default_label/sp_default_label.png
    A tests/testdata/control_images/expected_pal_server/sp_text_color/sp_text_color.png
    A tests/testdata/control_images/expected_pal_server/sp_text_size_map_unit/sp_text_size_map_unit.png
    A tests/testdata/labeling/aoi.qml
    A tests/testdata/labeling/background.qml
    M tests/testdata/labeling/pal_features_v3.sqlite
    M tests/testdata/labeling/point.qml
    A tests/testdata/testdata.qrc

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: feb79a81f11bd1244bfdcb7cd2e0e3ea0b6f2b14
      https://github.com/qgis/QGIS/commit/feb79a81f11bd1244bfdcb7cd2e0e3ea0b6f2b14
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-09-07 (Sat, 07 Sep 2013)

  Changed paths:
    M CMakeLists.txt
    M cmake/QsciAPI.cmake
    M debian/changelog
    M doc/TRANSLATORS
    M i18n/qgis_af.ts
    M i18n/qgis_ar.ts
    M i18n/qgis_bg.ts
    M i18n/qgis_bn.ts
    M i18n/qgis_bs_BA.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_en.ts
    M i18n/qgis_es.ts
    M i18n/qgis_et_EE.ts
    M i18n/qgis_eu.ts
    M i18n/qgis_fa.ts
    M i18n/qgis_fi.ts
    M i18n/qgis_fr.ts
    M i18n/qgis_gl.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_km.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_ml_IN.ts
    M i18n/qgis_mn.ts
    M i18n/qgis_nb_NO.ts
    M i18n/qgis_nl.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_Cyrl.ts
    M i18n/qgis_sr_Latn.ts
    M i18n/qgis_sv.ts
    M i18n/qgis_sw.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
    M images/icons/mac/asc.icns
    M images/icons/mac/ddf.icns
    M images/icons/mac/dem.icns
    M images/icons/mac/dt0.icns
    M images/icons/mac/gml.icns
    M images/icons/mac/img.icns
    M images/icons/mac/jp2.icns
    M images/icons/mac/mif.icns
    A images/icons/mac/mldata.icns
    M images/icons/mac/qgis.icns
    M images/icons/mac/qgs.icns
    M images/icons/mac/qgs.psd
    A images/icons/mac/qml.icns
    M images/icons/mac/shp.icns
    M images/icons/mac/tiff.icns
    M images/icons/qgis-icon-16x16.png
    M images/icons/qgis-icon-60x60.png
    A images/icons/qgis_icon.ai
    M images/images.qrc
    A images/themes/default/mActionAdd.svg
    M mac/app.info.plist.in
    M ms-windows/QGIS-Installer.nsi
    M ms-windows/osgeo4w/creatensis.pl
    M ms-windows/osgeo4w/package-nightly64.cmd
    M ms-windows/osgeo4w/package64.cmd
    M ms-windows/osgeo4w/postinstall-desktop.bat
    R ms-windows/osgeo4w/postinstall-desktop64.bat
    M ms-windows/osgeo4w/postinstall-dev.bat
    R ms-windows/osgeo4w/postinstall-dev64.bat
    M ms-windows/osgeo4w/preremove-desktop.bat
    A ms-windows/x64.nsh
    M python/CMakeLists.txt
    M python/__init__.py
    M python/console/console_output.py
    M python/console/console_sci.py
    M python/core/composer/qgsatlascomposition.sip
    M python/core/composer/qgscomposermap.sip
    M python/core/qgsattributeaction.sip
    M python/core/qgsfeature.sip
    M python/core/qgsgeometry.sip
    M python/core/qgspallabeling.sip
    M python/core/qgsprojectproperty.sip
    M python/core/qgsvectorlayer.sip
    M python/core/raster/qgsrasterbandstats.sip
    M python/gui/qgsrubberband.sip
    M python/plugins/db_manager/db_plugins/postgis/connector.py
    M python/plugins/db_manager/dlg_import_vector.py
    M python/plugins/db_manager/ui/DlgExportVector.ui
    M python/plugins/fTools/tools/doGeoprocessing.py
    M python/plugins/fTools/tools/doPointDistance.py
    M python/plugins/processing/algs/StatisticsByCategories.py
    M python/plugins/processing/algs/ftools/PointDistance.py
    M python/plugins/processing/core/GeoAlgorithm.py
    M python/plugins/processing/core/LayerExporter.py
    M python/plugins/processing/core/ProcessingUtils.py
    M python/plugins/processing/core/TableWriter.py
    M python/plugins/processing/gdal/translate.py
    M python/plugins/processing/gui/CouldNotLoadResultsDialog.py
    M python/plugins/processing/gui/HelpEditionDialog.py
    M python/plugins/processing/gui/MissingDependencyDialog.py
    M python/plugins/processing/modeler/CalculatorModelerParametersDialog.py
    M python/plugins/processing/modeler/ModelerDialog.py
    M python/plugins/processing/modeler/ModelerParametersDialog.py
    M python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py
    M python/plugins/processing/otb/description/EdisonMeanShiftSegmentation_vector.txt
    A python/plugins/processing/outputs/OutputExtent.py
    M python/plugins/processing/outputs/OutputRaster.py
    M python/plugins/processing/outputs/OutputTable.py
    M python/plugins/processing/outputs/OutputVector.py
    M python/plugins/processing/r/EditRScriptDialog.py
    M python/plugins/processing/saga/SagaAlgorithm.py
    M python/plugins/processing/saga/SagaAlgorithmProvider.py
    M python/plugins/processing/saga/SagaUtils.py
    A python/plugins/processing/saga/description/2.0.8_InverseDistanceWeighted.txt
    A python/plugins/processing/saga/description/2.1_InverseDistanceWeighted.txt
    R python/plugins/processing/saga/description/InverseDistanceWeighted.txt
    M python/plugins/processing/script/EditScriptDialog.py
    M python/plugins/processing/script/scripts/Create_tiling_from_vector_layer.py
    M python/pyplugin_installer/installer.py
    M python/pyplugin_installer/installer_data.py
    A python/qsci_apis/OSGeo_GDAL-OGR-1.10.0.api
    A python/qsci_apis/OSGeo_GEOS-3.4.2.api
    A python/qsci_apis/QScintilla2-2.7.2.api
    A python/qsci_apis/generate_console_pap.py
    A python/qsci_apis/pyqgis.pap
    R python/qsci_apis/pyqgis_master.pap
    M resources/function_help/strpos
    M resources/srs.db
    A resources/za_crs.sql
    M scripts/tsstat.pl
    M scripts/update_ts_files.sh
    M src/analysis/CMakeLists.txt
    M src/analysis/openstreetmap/qgsosmdatabase.cpp
    M src/analysis/vector/qgsgeometryanalyzer.cpp
    M src/app/CMakeLists.txt
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/app/legend/qgslegend.cpp
    M src/app/main.cpp
    M src/app/nodetool/qgsmaptoolnodetool.cpp
    M src/app/nodetool/qgsmaptoolnodetool.h
    M src/app/ogr/qgsvectorlayersaveasdialog.cpp
    M src/app/ogr/qgsvectorlayersaveasdialog.h
    M src/app/pluginmanager/qgspluginmanager.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.h
    M src/app/qgisappstylesheet.h
    M src/app/qgsabout.h
    M src/app/qgsaddattrdialog.cpp
    M src/app/qgsaddattrdialog.h
    M src/app/qgsaddjoindialog.h
    M src/app/qgsaddtaborgroup.h
    M src/app/qgsannotationwidget.h
    M src/app/qgsattributeactiondialog.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsattributetabledialog.h
    M src/app/qgsattributetypedialog.h
    M src/app/qgsattributetypeloaddialog.h
    M src/app/qgsbookmarks.h
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsclipboard.cpp
    M src/app/qgsclipboard.h
    M src/app/qgsconfigureshortcutsdialog.h
    M src/app/qgscustomization.h
    M src/app/qgscustomprojectiondialog.h
    M src/app/qgsdecorationcopyright.h
    M src/app/qgsdecorationcopyrightdialog.h
    M src/app/qgsdecorationgrid.h
    M src/app/qgsdecorationgriddialog.h
    M src/app/qgsdecorationitem.h
    M src/app/qgsdecorationnortharrow.h
    M src/app/qgsdecorationnortharrowdialog.h
    M src/app/qgsdecorationscalebar.h
    M src/app/qgsdecorationscalebardialog.h
    M src/app/qgsdelattrdialog.h
    M src/app/qgsdiagramproperties.h
    M src/app/qgsdisplayangle.h
    M src/app/qgsfeatureaction.cpp
    M src/app/qgsfeatureaction.h
    M src/app/qgsfieldcalculator.h
    M src/app/qgsfieldsproperties.cpp
    M src/app/qgsfieldsproperties.h
    M src/app/qgsformannotationdialog.h
    M src/app/qgshandlebadlayers.h
    M src/app/qgshtmlannotationdialog.h
    M src/app/qgsidentifyresultsdialog.cpp
    M src/app/qgsidentifyresultsdialog.h
    M src/app/qgslabeldialog.h
    M src/app/qgslabelengineconfigdialog.h
    M src/app/qgslabelinggui.cpp
    M src/app/qgslabelinggui.h
    M src/app/qgslabelpreview.h
    M src/app/qgslabelpropertydialog.h
    M src/app/qgsloadstylefromdbdialog.h
    M src/app/qgsmaptooladdfeature.h
    M src/app/qgsmaptooladdpart.h
    M src/app/qgsmaptooladdring.h
    M src/app/qgsmaptoolannotation.h
    M src/app/qgsmaptoolcapture.h
    M src/app/qgsmaptoolchangelabelproperties.h
    M src/app/qgsmaptooldeletepart.h
    M src/app/qgsmaptooldeletering.h
    M src/app/qgsmaptooledit.h
    M src/app/qgsmaptoolfeatureaction.h
    M src/app/qgsmaptoolformannotation.h
    M src/app/qgsmaptoolhtmlannotation.h
    M src/app/qgsmaptoolidentifyaction.h
    M src/app/qgsmaptoollabel.h
    M src/app/qgsmaptoolmeasureangle.h
    M src/app/qgsmaptoolmovefeature.h
    M src/app/qgsmaptoolmovelabel.h
    M src/app/qgsmaptooloffsetcurve.h
    M src/app/qgsmaptoolpinlabels.h
    M src/app/qgsmaptoolreshape.h
    M src/app/qgsmaptoolrotatefeature.h
    M src/app/qgsmaptoolrotatelabel.h
    M src/app/qgsmaptoolrotatepointsymbols.h
    M src/app/qgsmaptoolselect.h
    M src/app/qgsmaptoolselectfreehand.h
    M src/app/qgsmaptoolselectpolygon.h
    M src/app/qgsmaptoolselectradius.h
    M src/app/qgsmaptoolselectrectangle.h
    M src/app/qgsmaptoolshowhidelabels.h
    M src/app/qgsmaptoolsimplify.h
    M src/app/qgsmaptoolsplitfeatures.h
    M src/app/qgsmaptoolsvgannotation.h
    M src/app/qgsmaptooltextannotation.h
    M src/app/qgsmaptoolvertexedit.h
    M src/app/qgsmeasuredialog.cpp
    M src/app/qgsmeasuredialog.h
    M src/app/qgsmeasuretool.h
    M src/app/qgsmergeattributesdialog.h
    M src/app/qgsnewspatialitelayerdialog.h
    M src/app/qgsoptions.h
    M src/app/qgspastetransformations.h
    M src/app/qgspluginmetadata.h
    M src/app/qgspluginregistry.h
    M src/app/qgspointrotationitem.h
    M src/app/qgsprojectlayergroupdialog.h
    M src/app/qgsprojectproperties.cpp
    M src/app/qgsprojectproperties.h
    M src/app/qgsrastercalcdialog.h
    M src/app/qgsrasterlayerproperties.h
    M src/app/qgssavestyletodbdialog.h
    M src/app/qgsshortcutsmanager.h
    M src/app/qgssnappingdialog.h
    M src/app/qgssponsors.h
    M src/app/qgssvgannotationdialog.h
    M src/app/qgstextannotationdialog.h
    M src/app/qgstip.h
    M src/app/qgstipfactory.h
    M src/app/qgstipgui.h
    M src/app/qgsundowidget.h
    M src/app/qgsvectorlayerproperties.cpp
    M src/app/qgsvectorlayerproperties.h
    M src/core/CMakeLists.txt
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgsatlascomposition.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/diagram/qgspiediagram.cpp
    M src/core/pal/pal.cpp
    M src/core/pal/pal.h
    M src/core/qgis.h
    M src/core/qgsattributeaction.h
    M src/core/qgsdistancearea.cpp
    M src/core/qgsdistancearea.h
    M src/core/qgsfield.cpp
    M src/core/qgsfield.h
    M src/core/qgsgeometry.cpp
    M src/core/qgsgmlschema.cpp
    M src/core/qgslogger.cpp
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/core/qgsprojectproperty.cpp
    M src/core/qgsprojectproperty.h
    M src/core/qgsvectordataprovider.cpp
    M src/core/qgsvectorfilewriter.cpp
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/qgsvectorlayercache.cpp
    M src/core/qgsvectorlayercache.h
    M src/core/raster/qgsrasterblock.cpp
    M src/core/raster/qgsrasterrenderer.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/gui/CMakeLists.txt
    M src/gui/attributetable/qgsdualview.cpp
    M src/gui/attributetable/qgsdualview.h
    M src/gui/attributetable/qgsfeaturelistmodel.cpp
    M src/gui/qgscomposerview.cpp
    M src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
    M src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
    M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
    M src/gui/symbology-ng/qgssymbolslistwidget.cpp
    M src/mapserver/qgshttprequesthandler.cpp
    M src/mapserver/qgsprojectparser.cpp
    M src/plugins/compass/qgscompassplugin.cpp
    M src/plugins/coordinate_capture/coordinatecapture.cpp
    M src/plugins/dxf2shp_converter/dxf2shpconverter.cpp
    M src/plugins/georeferencer/qgsgeorefplugin.cpp
    M src/plugins/globe/globe_plugin.cpp
    M src/plugins/globe/globe_plugin.h
    M src/plugins/gps_importer/qgsgpsplugin.cpp
    M src/plugins/grass/qgsgrassedit.cpp
    M src/plugins/grass/qgsgrassplugin.cpp
    M src/plugins/spatialquery/qgsspatialqueryplugin.cpp
    M src/plugins/spit/qgsspitplugin.cpp
    M src/plugins/sqlanywhere/CMakeLists.txt
    M src/plugins/topology/topol.cpp
    M src/providers/gpx/gpsdata.cpp
    M src/providers/gpx/gpsdata.h
    M src/providers/gpx/qgsgpxfeatureiterator.cpp
    M src/providers/grass/qgis.d.rast.c
    M src/providers/grass/qgsgrassprovider.cpp
    M src/providers/grass/qgsgrassprovider.h
    M src/providers/memory/qgsmemoryprovider.cpp
    M src/providers/postgres/qgspostgresconn.cpp
    M src/providers/postgres/qgspostgresconn.h
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresfeatureiterator.cpp
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/providers/spatialite/qgsspatialitefeatureiterator.cpp
    M src/providers/spatialite/qgsspatialitefeatureiterator.h
    M src/providers/spatialite/qgsspatialiteprovider.cpp
    M src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
    M src/providers/wms/qgswmsprovider.cpp
    M src/python/CMakeLists.txt
    M src/ui/qgisapp.ui
    M src/ui/qgsbrowserdockwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M src/ui/qgsfieldspropertiesbase.ui
    M src/ui/qgslabelingguibase.ui
    M src/ui/qgsoptionsbase.ui
    M src/ui/qgspgnewconnectionbase.ui
    M src/ui/qgsvectorlayersaveasdialogbase.ui
    M tests/src/CMakeLists.txt
    A tests/src/app/CMakeLists.txt
    A tests/src/app/testqgisappclipboard.cpp
    M tests/src/core/testqgsatlascomposition.cpp
    M tests/src/core/testqgscomposermap.cpp
    M tests/src/python/qgis_local_server.py
    A tests/src/python/qgis_local_server_spawn/__init__.py
    A tests/src/python/qgis_local_server_spawn/flup/ChangeLog
    A tests/src/python/qgis_local_server_spawn/flup/PKG-INFO
    A tests/src/python/qgis_local_server_spawn/flup/README_QGIS.txt
    A tests/src/python/qgis_local_server_spawn/flup/__init__.py
    A tests/src/python/qgis_local_server_spawn/flup/server/__init__.py
    A tests/src/python/qgis_local_server_spawn/flup/server/ajp.py
    A tests/src/python/qgis_local_server_spawn/flup/server/ajp_base.py
    A tests/src/python/qgis_local_server_spawn/flup/server/threadedserver.py
    A tests/src/python/qgis_local_server_spawn/flup/server/threadpool.py
    A tests/src/python/qgis_local_server_spawn/flup_fcgi_client.py
    A tests/src/python/qgis_local_server_spawn/qgis_server_local_spawn.py
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/AUTHORS
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/CMakeLists.txt
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/COPYING
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/Makefile.am
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/NEWS
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/README
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/autogen.sh
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/configure.ac
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/doc/Makefile.am
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/doc/run-generic
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/doc/run-php
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/doc/run-rails
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/spawn-fcgi.1
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/src/CMakeLists.txt
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/src/Makefile.am
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/src/config.h.cmake
    A tests/src/python/qgis_local_server_spawn/spawn-fcgi/src/spawn-fcgi.c
    A tests/src/python/qgis_local_server_spawn/spawn-qgis-server-local.sh
    M tests/src/python/test_qgscomposermap.py
    M tests/src/python/test_qgspallabeling_base.py
    M tests/src/python/test_qgspallabeling_server.py
    A tests/testdata/control_images/expected_composermap/composermap_landsat_overview_center.png
    A tests/testdata/labeling/test-connection.qgs

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


  Commit: 32163900175a06ea3f3d1e3089d053ec4e216200
      https://github.com/qgis/QGIS/commit/32163900175a06ea3f3d1e3089d053ec4e216200
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-09-08 (Sun, 08 Sep 2013)

  Changed paths:
    M python/core/composer/qgscomposition.sip
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/composer/qgscompositionwidget.cpp
    M src/app/composer/qgscompositionwidget.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/ui/qgscompositionwidgetbase.ui
    M tests/src/core/testqgscomposermap.cpp
    M tests/src/python/test_qgscomposermap.py

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 4200046d8cf1853a75b030eeb22fbe4da2193b60
      https://github.com/qgis/QGIS/commit/4200046d8cf1853a75b030eeb22fbe4da2193b60
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M images/images.qrc
    M images/splash/splash.png
    M images/splash/splash.xcf.bz2
    A images/sponsors/aas_300wide.png
    A images/sponsors/bronze.png
    A images/sponsors/buttons.xcf
    A images/sponsors/gaia.png
    A images/sponsors/geosynergy.png
    A images/sponsors/gold.png
    A images/sponsors/ibw.png
    A images/sponsors/platinum.png
    A images/sponsors/silver.png
    A images/sponsors/vorarlberg.png
    M python/console/console_editor.py
    M python/plugins/processing/saga/SagaAlgorithmProvider.py
    M src/analysis/openstreetmap/qgsosmdatabase.cpp
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposer.h
    M src/app/main.cpp
    M src/core/composer/qgscomposeritem.cpp
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/qgsvectorfilewriter.cpp
    M src/core/raster/qgsrasterblock.cpp
    M src/gui/qgscomposerview.cpp
    M src/gui/qgscomposerview.h
    M src/plugins/grass/qtermwidget/BlockArray.cpp
    M src/plugins/grass/qtermwidget/k3process.cpp
    M src/plugins/grass/qtermwidget/k3processcontroller.cpp
    M src/plugins/grass/qtermwidget/kpty.cpp
    M src/providers/gpx/qgsgpxfeatureiterator.cpp
    M src/providers/postgres/qgspostgresconn.cpp
    M src/providers/postgres/qgspostgresconn.h
    M src/providers/postgres/qgspostgresfeatureiterator.cpp
    M src/ui/qgscomposerbase.ui
    M src/ui/qgssponsorsbase.ui
    M tests/src/app/testqgisappclipboard.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 23af7f7e160b24e8531b6a171bff05ac6d6f14c9
      https://github.com/qgis/QGIS/commit/23af7f7e160b24e8531b6a171bff05ac6d6f14c9
  Author: Luigi Pirelli <luipir at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M BUGS
    M CMakeLists.txt
    M ChangeLog
    M INSTALL
    M NEWS
    M README
    M cmake/FindPythonLibrary.cmake
    M cmake/FindQtMobility.cmake
    M doc/news.t2t
    M images/images.qrc
    R images/themes/default/mActionSplitFeatures.png
    A images/themes/default/mActionSplitParts.svg
    M python/CMakeLists.txt
    M python/core/composer/qgscomposerscalebar.sip
    M python/core/gps/qgsqtlocationconnection.sip
    M python/core/qgsapplication.sip
    M python/core/qgsclipper.sip
    M python/gui/qgisinterface.sip
    M python/utils.py
    A scripts/create_changelog.sh
    M src/app/CMakeLists.txt
    M src/app/composer/qgscomposer.cpp
    M src/app/main.cpp
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    M src/app/qgisappinterface.h
    M src/app/qgsmaptoolshowhidelabels.cpp
    A src/app/qgsmaptoolsplitparts.cpp
    A src/app/qgsmaptoolsplitparts.h
    M src/core/gps/qgsqtlocationconnection.h
    M src/core/qgsapplication.cpp
    M src/core/qgsapplication.h
    M src/core/qgsgeometry.cpp
    M src/core/qgsgeometry.h
    M src/core/qgsmaplayerregistry.h
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/qgsvectorlayereditutils.cpp
    M src/core/qgsvectorlayereditutils.h
    M src/gui/qgisinterface.h
    M src/gui/qgsattributedialog.h
    M src/gui/qgsmapcanvas.h
    M src/gui/qgsmessagelogviewer.cpp
    M src/gui/qgsmessagelogviewer.h
    M src/ui/qgisapp.ui

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master'


  Commit: 3035c95c8b1ee3558b71df42830b69d1fa95caba
      https://github.com/qgis/QGIS/commit/3035c95c8b1ee3558b71df42830b69d1fa95caba
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  Merge https://github.com/luipir/Quantum-GIS


Compare: https://github.com/qgis/QGIS/compare/125decfc2100...3035c95c8b1e

More information about the QGIS-commit mailing list