[QGIS Commit] [qgis/Quantum-GIS] 86ce85: Merge branch 'master' of https://github.com/qgis/Q...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 86ce8593b5fb92fc3706e83e3837fe9cfc3521c2
      https://github.com/qgis/Quantum-GIS/commit/86ce8593b5fb92fc3706e83e3837fe9cfc3521c2
  Author: Sergey Yakushev <yakushevs at gmail.com>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M i18n/qgis_de.ts
  M python/core/conversions.sip
  M python/core/qgscoordinatereferencesystem.sip
  M python/core/qgsvectordataprovider.sip
  M src/app/composer/qgscomposer.cpp
  M src/app/qgsattributetabledialog.cpp
  M src/core/composer/qgscomposition.cpp
  M src/core/qgscoordinatereferencesystem.cpp
  M src/core/qgscoordinatereferencesystem.h
  M src/core/qgsmaplayer.cpp
  M src/core/qgsmaplayer.h
  M src/core/qgsmaprenderer.cpp
  M src/core/qgsmaprenderer.h
  M src/core/qgspoint.cpp
  M src/core/qgsvectorlayer.cpp
  M src/core/raster/qgsrasterlayer.cpp
  M src/gui/attributetable/qgsattributetablememorymodel.cpp
  M src/gui/attributetable/qgsattributetablemodel.h
  M src/gui/attributetable/qgsattributetableview.cpp
  M src/gui/attributetable/qgsattributetableview.h
  M src/gui/qgsexpressionbuilderwidget.cpp
  M src/gui/qgsexpressionbuilderwidget.h
  M src/mapserver/qgswmsserver.cpp
  M src/mapserver/qgswmsserver.h
  M src/providers/grass/qgsgrass.h
  M src/providers/postgres/qgspostgresprovider.cpp
  M src/providers/spatialite/qgsspatialiteprovider.cpp

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


  Commit: 35cd0b96f6ca227cf76696b9a73d9a9f5e4b5026
      https://github.com/qgis/Quantum-GIS/commit/35cd0b96f6ca227cf76696b9a73d9a9f5e4b5026
  Author: Sergey Yakushev <yakushevs at gmail.com>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M python/analysis/network/qgsgraphanalyzer.sip
  M src/analysis/network/qgsgraphanalyzer.cpp
  M src/analysis/network/qgsgraphanalyzer.h
  M src/plugins/roadgraph/shortestpathwidget.cpp
  M src/plugins/roadgraph/shortestpathwidget.h

  Log Message:
  -----------
  RoadGraph: add dijkstra method to Network analysis library, remove unused shortestpath, update python bindings


Compare: https://github.com/qgis/Quantum-GIS/compare/3ba2fe9...35cd0b9