[QGIS Commit] [qgis/Quantum-GIS] 018a04: [FEATURE] WMTS

GitHub noreply at github.com
Tue Jun 12 23:19:26 PDT 2012


  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 018a047c5babc685da7a445df05ef70f2ba8fa77
      https://github.com/qgis/Quantum-GIS/commit/018a047c5babc685da7a445df05ef70f2ba8fa77
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-06 (Sun, 06 May 2012)

  Changed paths:
    M scripts/prepare-commit.sh
    M src/app/CMakeLists.txt
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    R src/app/qgstilescalewidget.cpp
    R src/app/qgstilescalewidget.h
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgsproviderregistry.cpp
    M src/core/qgsproviderregistry.h
    M src/gui/qgsmapcanvas.cpp
    M src/providers/wms/CMakeLists.txt
    A src/providers/wms/qgstilescalewidget.cpp
    A src/providers/wms/qgstilescalewidget.h
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsdataitems.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/providers/wms/qgswmssourceselect.cpp
    M src/providers/wms/qgswmssourceselect.h
    M src/ui/qgisapp.ui
    M src/ui/qgswmssourceselectbase.ui

  Log Message:
  -----------
  [FEATURE] WMTS


  Commit: c819bf1e2801833dc2ef54bf6567e26a4dab7ceb
      https://github.com/qgis/Quantum-GIS/commit/c819bf1e2801833dc2ef54bf6567e26a4dab7ceb
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    A src/providers/wms/qgswmtsdimensions.cpp
    A src/providers/wms/qgswmtsdimensions.h
    A src/ui/qgswmtsdimensionsbase.ui

  Log Message:
  -----------
  missed a dialog


  Commit: 8cde0d3e0f976ea35bc9536ba9e16f70de4fecb8
      https://github.com/qgis/Quantum-GIS/commit/8cde0d3e0f976ea35bc9536ba9e16f70de4fecb8
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-07 (Mon, 07 May 2012)

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

  Log Message:
  -----------
  WMTS/WMS updates:
- larger precision in BBOX (WMS/WMS-C)
- keep GetCapabilities request or document for GetCapabilities request (WMTS)
- parse multiple image format and infoFormat elements in GetCapabilities response
- support diffent nestings of TileMatrixSetLink/TileMatrixSet
- case insesitive parsing of ResourceURL attributes


  Commit: f262395106de6881b457d52f801a9d59959d8f39
      https://github.com/qgis/Quantum-GIS/commit/f262395106de6881b457d52f801a9d59959d8f39
  Author: Jean-Roc Morreale <jr.morreale at enoreth.net>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M i18n/qgis_fr.ts

  Log Message:
  -----------
  update fr strings


  Commit: 169e41258bc8319fe7ef395c5f4c1b641ce9a641
      https://github.com/qgis/Quantum-GIS/commit/169e41258bc8319fe7ef395c5f4c1b641ce9a641
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M tests/src/core/regression1141.cpp
    M tests/src/core/regression992.cpp
    M tests/src/core/testqgsmaprenderer.cpp
    M tests/src/core/testqgsrasterlayer.cpp

  Log Message:
  -----------
  Removed unused qsettings includes in tests


  Commit: d11603e7ecd12450cb1f52aab2f5df559405cc1e
      https://github.com/qgis/Quantum-GIS/commit/d11603e7ecd12450cb1f52aab2f5df559405cc1e
  Author: Nathan Woodrow <woodrow.nathan at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M src/plugins/georeferencer/qgsgeorefplugin.cpp
    M src/plugins/georeferencer/qgsgeorefplugingui.cpp
    M src/plugins/georeferencer/qgsgeorefplugingui.h

  Log Message:
  -----------
  Remove old GCPs in georeferencer; clear image on close.  Fixes #4310


  Commit: c09cc7f824556f0cbe9fbb72e1199e5c22c12406
      https://github.com/qgis/Quantum-GIS/commit/c09cc7f824556f0cbe9fbb72e1199e5c22c12406
  Author: Robert Szczepanek <robert at szczepanek.pl>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M i18n/qgis_pl_PL.ts

  Log Message:
  -----------
  translation update: PL by Robert


  Commit: d8b081e35b6c805a6c72236cbf8c365958e21f4e
      https://github.com/qgis/Quantum-GIS/commit/d8b081e35b6c805a6c72236cbf8c365958e21f4e
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M src/gui/qgsmessagelogviewer.cpp

  Log Message:
  -----------
  improve message log resizing


  Commit: ed47bcce37c8834e98cae74621377033c8069358
      https://github.com/qgis/Quantum-GIS/commit/ed47bcce37c8834e98cae74621377033c8069358
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M src/plugins/georeferencer/qgsgeorefplugingui.cpp

  Log Message:
  -----------
  Mark unused var


  Commit: 77b8a3372b9addb7a754f9c9ce729de1fe003aa9
      https://github.com/qgis/Quantum-GIS/commit/77b8a3372b9addb7a754f9c9ce729de1fe003aa9
  Author: Werner Macho <werner.macho at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M i18n/qgis_sl_SI.ts

  Log Message:
  -----------
  translation update: sl_SI by Joze


  Commit: 36b9ad1919cc381b430eb6346c47c1570444c1f5
      https://github.com/qgis/Quantum-GIS/commit/36b9ad1919cc381b430eb6346c47c1570444c1f5
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M src/core/qgsdataitem.cpp
    M src/core/qgsmaplayer.cpp
    M tests/src/core/testziplayer.cpp

  Log Message:
  -----------
  fix ziplayer handling for windows


  Commit: 7544239b9573a7c346ad1a75aa4ae473e48e570f
      https://github.com/qgis/Quantum-GIS/commit/7544239b9573a7c346ad1a75aa4ae473e48e570f
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M CMakeLists.txt
    M PROVENANCE
    M cmake_templates/qgsconfig.h.in
    M src/app/qgsoptions.cpp
    M src/core/CMakeLists.txt
    M src/core/qgsdataitem.cpp
    R src/core/quazip/COPYING
    R src/core/quazip/JlCompress.cpp
    R src/core/quazip/JlCompress.h
    R src/core/quazip/README.txt
    R src/core/quazip/crypt.h
    R src/core/quazip/ioapi.h
    R src/core/quazip/qioapi.cpp
    R src/core/quazip/quaadler32.cpp
    R src/core/quazip/quaadler32.h
    R src/core/quazip/quachecksum32.h
    R src/core/quazip/quacrc32.cpp
    R src/core/quazip/quacrc32.h
    R src/core/quazip/quazip.cpp
    R src/core/quazip/quazip.h
    R src/core/quazip/quazip_global.h
    R src/core/quazip/quazipfile.cpp
    R src/core/quazip/quazipfile.h
    R src/core/quazip/quazipfileinfo.h
    R src/core/quazip/quazipnewinfo.cpp
    R src/core/quazip/quazipnewinfo.h
    R src/core/quazip/unzip.c
    R src/core/quazip/unzip.h
    R src/core/quazip/zip.c
    R src/core/quazip/zip.h
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M src/providers/ogr/qgsogrdataitems.cpp
    M src/providers/ogr/qgsogrprovider.cpp
    M tests/src/core/testziplayer.cpp

  Log Message:
  -----------
  use VSIReadDir() from gdal instead of quazip for listing .zip files and remove quazip entirely, including HAVE_ZLIB variable ; set default scanZip to 2 (Basic Scan)


  Commit: 3ff1bff14cc14038cc672349ee23f12191782531
      https://github.com/qgis/Quantum-GIS/commit/3ff1bff14cc14038cc672349ee23f12191782531
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-14 (Mon, 14 May 2012)

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

  Log Message:
  -----------
  wmts fixes:
- fix tile limits
- fix support support for multiple formats


  Commit: be13365a69f955c675d7a6f3903d5e4667e71c77
      https://github.com/qgis/Quantum-GIS/commit/be13365a69f955c675d7a6f3903d5e4667e71c77
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/analysis/raster/qgsrastercalculator.cpp

  Log Message:
  -----------
  Rastercalculator: fix for reading out of source raster bounds


  Commit: b2dbfc8f39f77524c4bf35c0f0e77e297dceba58
      https://github.com/qgis/Quantum-GIS/commit/b2dbfc8f39f77524c4bf35c0f0e77e297dceba58
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/app/qgsoptions.cpp

  Log Message:
  -----------
  fix overriding of locale in options


  Commit: 8b2445eaceeb33c03a448aef0709c7f2c8066fef
      https://github.com/qgis/Quantum-GIS/commit/8b2445eaceeb33c03a448aef0709c7f2c8066fef
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M cmake/FindGDAL.cmake

  Log Message:
  -----------
  fix GDAL version check


  Commit: 663beae1b2e36d9910876e4f4fe8b5fc7dbaa6e0
      https://github.com/qgis/Quantum-GIS/commit/663beae1b2e36d9910876e4f4fe8b5fc7dbaa6e0
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M doc/linux.t2t

  Log Message:
  -----------
  re-run scripts/scandeps.pl


  Commit: 4be77266d33d3ae0c0e68a70e93ad24d3847d173
      https://github.com/qgis/Quantum-GIS/commit/4be77266d33d3ae0c0e68a70e93ad24d3847d173
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M INSTALL
    M doc/INSTALL.html

  Log Message:
  -----------
  run make t2tdoc


  Commit: f4c21a175378f8c14051fac577c6b66da2b8ffe9
      https://github.com/qgis/Quantum-GIS/commit/f4c21a175378f8c14051fac577c6b66da2b8ffe9
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/mapserver/qgshostedrdsbuilder.cpp
    M src/mapserver/qgshostedvdsbuilder.cpp
    M src/mapserver/qgsmslayercache.cpp
    M src/mapserver/qgsmslayercache.h
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsremoteowsbuilder.cpp

  Log Message:
  -----------
  Invalidate cache layers if project files are changed


  Commit: 30d270f64ea4f910d6780bf8310db01bb3f58e78
      https://github.com/qgis/Quantum-GIS/commit/30d270f64ea4f910d6780bf8310db01bb3f58e78
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/mapserver/qgshostedrdsbuilder.cpp
    M src/mapserver/qgshostedvdsbuilder.cpp
    M src/mapserver/qgsmslayercache.cpp
    M src/mapserver/qgsmslayercache.h
    M src/mapserver/qgsremoteowsbuilder.cpp

  Log Message:
  -----------
  Empty config file entry in layer cache for sld layers


  Commit: 3b0d3dbe22ddcb0c509c465a5a32ae77dea98c82
      https://github.com/qgis/Quantum-GIS/commit/3b0d3dbe22ddcb0c509c465a5a32ae77dea98c82
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/mapserver/CMakeLists.txt
    M src/mapserver/qgsmslayercache.h

  Log Message:
  -----------
  QgsMSLayerCache inherits from QObject to use signal/slot mechanism


  Commit: 99f88b312fb8f11a45469df11a40552428642c32
      https://github.com/qgis/Quantum-GIS/commit/99f88b312fb8f11a45469df11a40552428642c32
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M python/plugins/fTools/tools/doSimplify.py

  Log Message:
  -----------
  add MultiLineString support to Densify geometries tool (addresses #5577)


  Commit: 32cd9b55db1b74cb16bf68f532518fe6a9637756
      https://github.com/qgis/Quantum-GIS/commit/32cd9b55db1b74cb16bf68f532518fe6a9637756
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M python/plugins/fTools/tools/doSimplify.py

  Log Message:
  -----------
  also add MultiPolygon support in Densify geometry


  Commit: f48a4bf60f78b57afdc52691bcdfbb10117012b0
      https://github.com/qgis/Quantum-GIS/commit/f48a4bf60f78b57afdc52691bcdfbb10117012b0
  Author: slarosa <sal.larosa at libero.it>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M python/plugins/fTools/tools/doSimplify.py

  Log Message:
  -----------
  Add Multigeometries support in Simplify tool for geomVertexCount function


  Commit: 260d76b8859663ce6c6bf79cb62526a6ea8dc49d
      https://github.com/qgis/Quantum-GIS/commit/260d76b8859663ce6c6bf79cb62526a6ea8dc49d
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M cmake/FindGDAL.cmake

  Log Message:
  -----------
  fix cmake warning and report GDAL version


  Commit: d6ea1b94a978e13b63b6fe5fb023ce6cee987e5e
      https://github.com/qgis/Quantum-GIS/commit/d6ea1b94a978e13b63b6fe5fb023ce6cee987e5e
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M python/plugins/fTools/tools/doSimplify.py

  Log Message:
  -----------
  minor formatting fixes


  Commit: 52a35edd07a91134badca081376e33c9132c28a3
      https://github.com/qgis/Quantum-GIS/commit/52a35edd07a91134badca081376e33c9132c28a3
  Author: Alexander Bruy <alexander.bruy at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M python/plugins/fTools/tools/doGeometry.py
    M python/plugins/fTools/tools/doSimplify.py

  Log Message:
  -----------
  show warning before updating exisiting shapefile (fix #5335)


  Commit: e454c5f764fd634f60b721668857862fec0bb626
      https://github.com/qgis/Quantum-GIS/commit/e454c5f764fd634f60b721668857862fec0bb626
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M debian/control.lucid
    M debian/control.oneiric
    M debian/control.precise

  Log Message:
  -----------
  debian packaging: add optional support for gdal 1.9 in ubuntu lucid/oneiric/precise


  Commit: f3330e6bb7f6f56d35faafc182c3ce40a4bb18b3
      https://github.com/qgis/Quantum-GIS/commit/f3330e6bb7f6f56d35faafc182c3ce40a4bb18b3
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp
    M src/gui/qgsmanageconnectionsdialog.cpp
    M src/gui/qgsnewhttpconnection.cpp
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgsnewhttpconnectionbase.ui

  Log Message:
  -----------
  wmts fixes:
- [FEATURE] add support for CRS:27 and CRS:83 in QgsCoordinateReferenceSystem
- fix axis orientation for CRS:84
- respect inverted axis orientation in WMTS and allow to ignore it for WMS 1.3/WMTS
- fix: only consider valid TileMatrixSetLimits


  Commit: d28b655999dd7d6ba701d82860a98a59eb4c1377
      https://github.com/qgis/Quantum-GIS/commit/d28b655999dd7d6ba701d82860a98a59eb4c1377
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-17 (Thu, 17 May 2012)

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

  Log Message:
  -----------
  WMTS/WMS-C: remove Cache-Control header from tile requests to force cache usage


  Commit: 8b86d8330e0afc26bbe086203bd879207a1b4dc0
      https://github.com/qgis/Quantum-GIS/commit/8b86d8330e0afc26bbe086203bd879207a1b4dc0
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

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

  Log Message:
  -----------
  fix feature info for WMS 1.3


  Commit: 45dc1051136e2cedb930944105363335a2106865
      https://github.com/qgis/Quantum-GIS/commit/45dc1051136e2cedb930944105363335a2106865
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgsmaprenderer.cpp

  Log Message:
  -----------
  QgsMapRenderer: Load projection flag and destination CRS before extent. Fixes ticket #5605


  Commit: 19e2286bf1e8320ce144d9ea1139586017a07831
      https://github.com/qgis/Quantum-GIS/commit/19e2286bf1e8320ce144d9ea1139586017a07831
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/app/main.cpp
    M src/python/qgspythonutilsimpl.cpp

  Log Message:
  -----------
  fix #5544


  Commit: 46dba8a215d51db6a65192d2708ea8fbd403d743
      https://github.com/qgis/Quantum-GIS/commit/46dba8a215d51db6a65192d2708ea8fbd403d743
  Author: D'Hont René-Luc <rldhont at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/mapserver/qgswfsserver.cpp
    M src/mapserver/qgswfsserver.h

  Log Message:
  -----------
  WFS service Capability request resource bug


  Commit: d651892bedd8881e8d06ff2fd0328eae189c57aa
      https://github.com/qgis/Quantum-GIS/commit/d651892bedd8881e8d06ff2fd0328eae189c57aa
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/providers/postgres/qgspostgresprovider.cpp

  Log Message:
  -----------
  log more verbose error messages if the view primary key selection is wrong.


  Commit: 56353916dfa7e26dd3cb97842c83ff9812169465
      https://github.com/qgis/Quantum-GIS/commit/56353916dfa7e26dd3cb97842c83ff9812169465
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  fix #5176


  Commit: ee2dd79d394ca24976fe195b274e3847fc30029a
      https://github.com/qgis/Quantum-GIS/commit/ee2dd79d394ca24976fe195b274e3847fc30029a
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    A scripts/addcopyright.sh
    M src/analysis/interpolation/HalfEdge.cc
    M src/analysis/interpolation/TriangleInterpolator.cc
    M src/analysis/interpolation/Triangulation.cc
    M src/analysis/raster/qgsrastercalcnode.cpp
    M src/app/composer/qgscomposerlegendlayersdialog.cpp
    M src/app/composer/qgscomposerlegendlayersdialog.h
    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/qgsbrowserdockwidget.cpp
    M src/app/qgsbrowserdockwidget.h
    M src/app/qgsembedlayerdialog.cpp
    M src/app/qgsembedlayerdialog.h
    M src/app/qgsformannotationdialog.cpp
    M src/app/qgsformannotationdialog.h
    M src/app/qgslabelengineconfigdialog.cpp
    M src/app/qgslabelengineconfigdialog.h
    M src/app/qgslabelpreview.cpp
    M src/app/qgslabelpreview.h
    M src/app/qgstip.h
    M src/app/qgstipfactory.cpp
    M src/app/qgstipfactory.h
    M src/app/qgsundowidget.cpp
    M src/app/qgsundowidget.h
    M src/core/pal/costcalculator.cpp
    M src/core/pal/costcalculator.h
    M src/core/qgsbrowsermodel.cpp
    M src/core/qgsbrowsermodel.h
    M src/core/qgsdiagram.cpp
    M src/core/qgsdiagram.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/core/qgslabelsearchtree.cpp
    M src/core/qgsmimedatautils.cpp
    M src/core/qgsmimedatautils.h
    M src/core/qgspluginlayer.cpp
    M src/core/qgspluginlayer.h
    M src/core/qgspythonrunner.cpp
    M src/core/qgspythonrunner.h
    M src/core/qgsvectorlayerundocommand.cpp
    M src/core/qgsvectorlayerundocommand.h
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
    M src/core/symbology-ng/qgscolorbrewerpalette.h
    M src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
    M src/core/symbology-ng/qgsellipsesymbollayerv2.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/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/qgsprojectbadlayerguihandler.cpp
    M src/gui/qgsprojectbadlayerguihandler.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/qgsellipsesymbollayerv2widget.h
    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/qgssinglesymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
    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/qgssymbolv2propertiesdialog.cpp
    M src/gui/symbology-ng/qgssymbolv2propertiesdialog.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/qgsvectorfieldsymbollayerwidget.cpp
    M src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
    M src/gui/symbology-ng/qgsvectorfieldwidget.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/qgsgetrequesthandler.cpp
    M src/mapserver/qgslogicalfilter.cpp
    M src/mapserver/qgsmsutils.cpp
    M src/mapserver/qgsmsutils.h
    M src/plugins/diagram_overlay/qgsdiagramrenderer.cpp
    M src/plugins/globe/qgsosgearthtilesource.cpp
    M src/plugins/globe/qgsosgearthtilesource.h
    M src/plugins/grass/qgis.g.browser.cpp
    M src/plugins/interpolation/qgsidwinterpolatordialog.cpp
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.h
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdaldataitems.h
    M src/providers/grass/qgis.d.rast.c
    M src/providers/grass/qgis.g.info.c
    M src/providers/postgres/qgspostgresdataitems.cpp
    M src/providers/postgres/qgspostgresdataitems.h
    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/wfs/qgswfsconnection.cpp
    M src/providers/wfs/qgswfsconnection.h
    M src/providers/wfs/qgswfsdataitems.cpp
    M src/providers/wfs/qgswfsdataitems.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

  Log Message:
  -----------
  add missing copyright headers to c++ files


  Commit: b7f5c2864d880ca98290e576bcc7108823befbe0
      https://github.com/qgis/Quantum-GIS/commit/b7f5c2864d880ca98290e576bcc7108823befbe0
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgsdataitem.cpp

  Log Message:
  -----------
  zip files: update VSIReadDirRecursive1() from VSIReadDirRecursive() in gdal trunk, fixes long filename issues (see gdal bug#4658)


  Commit: d11f0f527756452d5c58af08204779307f3f0e32
      https://github.com/qgis/Quantum-GIS/commit/d11f0f527756452d5c58af08204779307f3f0e32
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  trim proj4 parameters for sql queries (#5598)


  Commit: d0728856f0807a8c0f811e24190b1aa0d5c47c90
      https://github.com/qgis/Quantum-GIS/commit/d0728856f0807a8c0f811e24190b1aa0d5c47c90
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgscoordinatereferencesystem.cpp

  Log Message:
  -----------
  prefer non-deprecated crses (fixes part of #4977)


  Commit: 86243eb8fe0e43dfa02c050c89e8e44283240b38
      https://github.com/qgis/Quantum-GIS/commit/86243eb8fe0e43dfa02c050c89e8e44283240b38
  Author: Etienne Tourigny <etourigny.dev at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M src/core/qgsdataitem.cpp
    M tests/src/core/testziplayer.cpp
    M tests/testdata/testzip.zip

  Log Message:
  -----------
  fix zip file reading for gdal<1.9 and add test for folder-in-zip


  Commit: 8cb380ade1912ec029e38c840f508d399ded3d5d
      https://github.com/qgis/Quantum-GIS/commit/8cb380ade1912ec029e38c840f508d399ded3d5d
  Author: Giuseppe Sucameli <brush.tyler at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M python/plugins/db_manager/db_manager.py

  Log Message:
  -----------
  DBManager: remove label from separators (fix #5393)


  Commit: db6f314f3828ef38f381532d16d4a2e602d2cb14
      https://github.com/qgis/Quantum-GIS/commit/db6f314f3828ef38f381532d16d4a2e602d2cb14
  Author: Giuseppe Sucameli <brush.tyler at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M python/plugins/db_manager/table_viewer.py

  Log Message:
  -----------
  DBManager: don't raise any errors while disconnecting signals from destroyed objects


  Commit: c4adf7761597ece34dc517113f14cf2e8aa13670
      https://github.com/qgis/Quantum-GIS/commit/c4adf7761597ece34dc517113f14cf2e8aa13670
  Author: Giuseppe Sucameli <brush.tyler at gmail.com>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M python/plugins/db_manager/db_plugins/connector.py

  Log Message:
  -----------
  DBManager: added missing required (not implicit) self argument


  Commit: 095779d92762ffe7ecf664cb59adf9b598d6ca27
      https://github.com/qgis/Quantum-GIS/commit/095779d92762ffe7ecf664cb59adf9b598d6ca27
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M doc/index.dox

  Log Message:
  -----------
  update icon link for api doc


  Commit: 74a612bb2bf4f6059dcdcdd720d12233d7654a89
      https://github.com/qgis/Quantum-GIS/commit/74a612bb2bf4f6059dcdcdd720d12233d7654a89
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M doc/index.dox

  Log Message:
  -----------
  update icon link for api doc - again


  Commit: abda05c11aa57a27dda7a3fc195fb2e8e32908a1
      https://github.com/qgis/Quantum-GIS/commit/abda05c11aa57a27dda7a3fc195fb2e8e32908a1
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-21 (Mon, 21 May 2012)

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

  Log Message:
  -----------
  merge master:
- don't use createFromEpsg
- cleanup: don't save tiles for debugging


  Commit: dfb8fcb971a0da7b09beb9b9612b32907a0fb384
      https://github.com/qgis/Quantum-GIS/commit/dfb8fcb971a0da7b09beb9b9612b32907a0fb384
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-22 (Tue, 22 May 2012)

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

  Log Message:
  -----------
  wmts: use KVP GetMap only when allowed


  Commit: e7af002b538234fff2cb467f047245c470dcd802
      https://github.com/qgis/Quantum-GIS/commit/e7af002b538234fff2cb467f047245c470dcd802
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-05-22 (Tue, 22 May 2012)

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

  Log Message:
  -----------
  wmts: use QObject property to make tile resolutions available to tilescalewidget


  Commit: 08a712a5f04be32961fcd58a25781af6eabe4983
      https://github.com/qgis/Quantum-GIS/commit/08a712a5f04be32961fcd58a25781af6eabe4983
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M src/gui/qgsmanageconnectionsdialog.cpp
    M src/gui/qgsnewhttpconnection.cpp
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/ui/qgsnewhttpconnectionbase.ui

  Log Message:
  -----------
  add support for optional wm(t)s axis inversion


  Commit: 18bafb370a785a2067d655399f495699d18505fb
      https://github.com/qgis/Quantum-GIS/commit/18bafb370a785a2067d655399f495699d18505fb
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    A .mailmap
    M NEWS
    M debian/libqgis-dev.install
    R debian/libqgis{QGIS_ABI}-dev.install
    M debian/rules
    M doc/TRANSLATORS
    M doc/news.html
    M doc/news.t2t
    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
    M images/icons/qgis-icon-60x60.png
    M mac/cmake/1qt.cmake.in
    M python/core/qgscoordinatereferencesystem.sip
    M python/core/qgsexpression.sip
    M python/gui/qgsmapcanvas.sip
    M python/plugins/fTools/fTools.py
    M python/plugins/fTools/tools/doGeometry.py
    M python/plugins/fTools/tools/doGeoprocessing.py
    M python/plugins/fTools/tools/doMeanCoords.py
    M python/plugins/fTools/tools/doPointsInPolygon.py
    M python/plugins/fTools/tools/doRandPoints.py
    M python/plugins/fTools/tools/doSelectByLocation.py
    M python/plugins/fTools/tools/doValidate.py
    M python/plugins/fTools/tools/doVectorGrid.py
    M python/plugins/fTools/tools/frmPointsInPolygon.ui
    M python/plugins/fTools/tools/frmSpatialJoin.ui
    M python/plugins/fTools/tools/frmVectorSplit.ui
    M python/plugins/fTools/tools/ftools_utils.py
    M resources/customization.xml
    M scripts/tsstat.pl
    M scripts/update_ts_files.sh
    M src/app/composer/qgscomposer.cpp
    M src/app/nodetool/qgsmaptoolnodetool.cpp
    M src/app/nodetool/qgsmaptoolnodetool.h
    M src/app/nodetool/qgsselectedfeature.cpp
    M src/app/nodetool/qgsselectedfeature.h
    M src/app/nodetool/qgsvertexentry.cpp
    M src/app/nodetool/qgsvertexentry.h
    M src/app/qgisapp.cpp
    M src/app/qgsbrowserdockwidget.cpp
    M src/app/qgscustomprojectiondialog.cpp
    M src/app/qgshighlight.cpp
    M src/app/qgsoptions.cpp
    M src/core/qgis.h
    M src/core/qgsapplication.cpp
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgscoordinatereferencesystem.h
    M src/core/qgsdataitem.h
    M src/core/qgsdistancearea.cpp
    M src/core/qgsexpression.h
    M src/core/qgsgeometry.cpp
    M src/core/qgsgeometry.h
    M src/core/qgsgeometryvalidator.cpp
    M src/core/qgsmaplayer.cpp
    M src/core/qgsmaplayer.h
    M src/core/qgsmessageoutput.cpp
    M src/core/qgsmessageoutput.h
    M src/core/qgsmimedatautils.cpp
    M src/core/qgspoint.cpp
    M src/core/qgspoint.h
    M src/core/qgsvectorfilewriter.cpp
    M src/core/qgsvectorlayer.cpp
    M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
    M src/crssync/main.cpp
    M src/gui/qgsmaptip.cpp
    M src/gui/qgsmessagelogviewer.cpp
    M src/gui/qgsmessagelogviewer.h
    M src/gui/qgsprojectionselector.cpp
    M src/gui/qgsprojectionselector.h
    M src/gui/qgsquerybuilder.cpp
    M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
    M src/helpviewer/qgshelpviewer.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/grass/locations.gml
    M src/plugins/grass/qgsgrassnewmapset.cpp
    M src/plugins/sqlanywhere/CMakeLists.txt
    R src/plugins/sqlanywhere/sadbfilterproxymodel.cpp
    R src/plugins/sqlanywhere/sadbfilterproxymodel.h
    R src/plugins/sqlanywhere/saquerybuilder.cpp
    R src/plugins/sqlanywhere/saquerybuilder.h
    M src/plugins/sqlanywhere/sasourceselect.cpp
    M src/plugins/sqlanywhere/sasourceselect.h
    M src/providers/gdal/qgsgdaldataitems.cpp
    M src/providers/gdal/qgsgdaldataitems.h
    M src/providers/mssql/qgsmssqlprovider.cpp
    M src/providers/mssql/qgsmssqlprovider.h
    M src/providers/ogr/qgsogrdataitems.cpp
    M src/providers/ogr/qgsogrdataitems.h
    M src/providers/ogr/qgsogrprovider.cpp
    M src/providers/ogr/qgsogrprovider.h
    R src/providers/postgres/qgsdbfilterproxymodel.cpp
    R src/providers/postgres/qgsdbfilterproxymodel.h
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/ui/qgsprojectionselectorbase.ui
    M tests/src/core/CMakeLists.txt
    M tests/src/core/testqgscoordinatereferencesystem.cpp
    A tests/src/core/testqgsdataitem.cpp
    M tests/src/core/testziplayer.cpp
    A tests/testdata/bug5598.dbf
    A tests/testdata/bug5598.prj
    A tests/testdata/bug5598.shp
    A tests/testdata/bug5598.shx
    A tests/testdata/control_images/expected_continuous/windows_continuous_anomaly.png
    A tests/testdata/control_images/expected_graduated/windows_graduated_anomaly.png
    A tests/testdata/control_images/expected_landsat_875/windows_landsat875_anomaly.png
    A tests/testdata/control_images/expected_rgbwcmyk01_YeGeo.jp2/windows_rgbwcmyk01_YeGeo_anomaly.png
    A tests/testdata/control_images/expected_single/windows_single_anomaly.png
    A tests/testdata/control_images/expected_uniquevalue/windows_anomaly.png
    A tests/testdata/points.vrt
    M tests/testdata/testzip.zip

  Log Message:
  -----------
  Merge branch 'master' into wmts


  Commit: 38d15f12009287bf9c861c14ecabb31a1c206def
      https://github.com/qgis/Quantum-GIS/commit/38d15f12009287bf9c861c14ecabb31a1c206def
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

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

  Log Message:
  -----------
  fix WMS-C


  Commit: 3c746c7667e2ff9c386ac222ca2eee778ee7f4a4
      https://github.com/qgis/Quantum-GIS/commit/3c746c7667e2ff9c386ac222ca2eee778ee7f4a4
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-06 (Wed, 06 Jun 2012)

  Changed paths:
    M INSTALL
    M doc/TRANSLATORS
    M doc/msvc.t2t
    M i18n/qgis_gl_ES.ts
    M i18n/qgis_it.ts
    M i18n/qgis_ja.ts
    M i18n/qgis_nl.ts
    M i18n/qgis_pl_PL.ts
    M i18n/qgis_pt_BR.ts
    M python/core/qgsmaplayerregistry.sip
    M scripts/tsstat.pl
    M src/providers/ogr/qgsogrprovider.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into wmts


  Commit: d4256fe4b024a7c948eae7cc89f6fc3cc285b1bf
      https://github.com/qgis/Quantum-GIS/commit/d4256fe4b024a7c948eae7cc89f6fc3cc285b1bf
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M doc/INSTALL.t2t
    M doc/TRANSLATORS
    M doc/msvc.t2t
    M doc/msys.t2t
    M i18n/qgis_de.ts
    M i18n/qgis_et_EE.ts
    M i18n/qgis_nl.ts
    M i18n/qgis_pl_PL.ts
    M python/plugins/fTools/__init__.py
    M python/plugins/plugin_installer/installer_data.py
    M python/plugins/plugin_installer/installer_gui.py
    M python/plugins/plugin_installer/qgsplugininstallerbase.ui
    M resources/customization.xml
    M src/app/ogr/qgsogrhelperfunctions.cpp
    M src/app/qgsmergeattributesdialog.cpp
    M src/core/composer/qgscomposerarrow.cpp
    M src/core/composer/qgscomposeritem.cpp
    M src/core/composer/qgscomposerlegend.cpp
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposerpicture.cpp
    M src/core/composer/qgscomposerscalebar.cpp
    M src/core/composer/qgscomposershape.cpp
    M src/core/composer/qgscomposertable.cpp
    M src/core/composer/qgscomposition.cpp
    M src/core/pal/costcalculator.cpp
    M src/core/pal/feature.cpp
    M src/core/pal/pal.cpp
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgslabel.cpp
    M src/core/qgsmaplayer.cpp
    M src/core/qgsvectorlayer.cpp
    M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
    M src/core/symbology-ng/qgspointdisplacementrenderer.cpp
    M src/core/symbology-ng/qgssymbollayerv2utils.cpp
    M src/gui/qgsannotationitem.cpp
    M src/gui/qgsprojectionselector.cpp
    M src/mapserver/qgswmsserver.cpp
    M src/plugins/heatmap/heatmapguibase.ui
    M src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp
    M src/providers/wfs/qgswfsprovider.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into wmts


  Commit: ef60f812e314765e0c109fedf6105dcb8d36ceee
      https://github.com/qgis/Quantum-GIS/commit/ef60f812e314765e0c109fedf6105dcb8d36ceee
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M src/gui/qgsnewhttpconnection.cpp

  Log Message:
  -----------
  fix query item removal


  Commit: f276fdee6cec17e24b0e354e4f54733d3f42a805
      https://github.com/qgis/Quantum-GIS/commit/f276fdee6cec17e24b0e354e4f54733d3f42a805
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M ChangeLog
    M NEWS
    M doc/TRANSLATORS
    M doc/news.t2t
    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
    M python/plugins/GdalTools/GdalTools.py
    M python/plugins/db_manager/__init__.py
    M python/plugins/db_manager/db_plugins/plugin.py
    M python/plugins/db_manager/dlg_add_geometry_column.py
    M python/plugins/db_manager/dlg_create_table.py
    M python/plugins/db_manager/dlg_import_vector.py
    M scripts/tsstat.pl
    M src/app/composer/qgscomposer.cpp
    M src/app/qgisapp.cpp
    M src/core/qgsproviderregistry.cpp
    M src/gui/attributetable/qgsattributetablemodel.cpp
    M src/providers/postgres/qgspostgresprovider.cpp
    M src/ui/qgisapp.ui

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into wmts


  Commit: 904cef013114c93691d1ab9ed2079b2c3dcf35d1
      https://github.com/qgis/Quantum-GIS/commit/904cef013114c93691d1ab9ed2079b2c3dcf35d1
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M scripts/prepare-commit.sh
    M src/app/CMakeLists.txt
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    R src/app/qgstilescalewidget.cpp
    R src/app/qgstilescalewidget.h
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgsproviderregistry.cpp
    M src/core/qgsproviderregistry.h
    M src/gui/qgsmanageconnectionsdialog.cpp
    M src/gui/qgsmapcanvas.cpp
    M src/gui/qgsnewhttpconnection.cpp
    M src/providers/wms/CMakeLists.txt
    A src/providers/wms/qgstilescalewidget.cpp
    A src/providers/wms/qgstilescalewidget.h
    M src/providers/wms/qgswmsconnection.cpp
    M src/providers/wms/qgswmsdataitems.cpp
    M src/providers/wms/qgswmsprovider.cpp
    M src/providers/wms/qgswmsprovider.h
    M src/providers/wms/qgswmssourceselect.cpp
    M src/providers/wms/qgswmssourceselect.h
    A src/providers/wms/qgswmtsdimensions.cpp
    A src/providers/wms/qgswmtsdimensions.h
    M src/ui/qgisapp.ui
    M src/ui/qgsnewhttpconnectionbase.ui
    M src/ui/qgswmssourceselectbase.ui
    A src/ui/qgswmtsdimensionsbase.ui

  Log Message:
  -----------
  [FEATURE] Add WMTS support


Compare: https://github.com/qgis/Quantum-GIS/compare/5ebdbe34f2fb...904cef013114


More information about the QGIS-commit mailing list