[QGIS Commit] [qgis/Quantum-GIS] 6ddf1f: Merge branch 'master' of github.com:qgis/Quantum-G...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: 6ddf1f6dfec8a2cc13c6b936b12a117b4c8cfd04
      https://github.com/qgis/Quantum-GIS/commit/6ddf1f6dfec8a2cc13c6b936b12a117b4c8cfd04
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M .gitignore
  M CMakeLists.txt
  M cmake/FindPostgres.cmake
  M i18n/qgis_pt_PT.ts
  M python/plugins/fTools/fTools.py
  M python/plugins/fTools/tools/doMergeShapes.py
  M python/plugins/fTools/tools/doSimplify.py
  M python/plugins/fTools/tools/doSpatialIndex.py
  M python/plugins/fTools/tools/doVectorSplit.py
  M src/analysis/CMakeLists.txt
  M src/analysis/network/CMakeLists.txt
  M src/app/CMakeLists.txt
  M src/app/main.cpp
  M src/app/qgisapp.cpp
  M src/app/qgspluginregistry.cpp
  A src/app/qtmain_android.cpp
  M src/core/CMakeLists.txt
  M src/core/qgscoordinatetransform.cpp
  M src/core/qgscoordinatetransform.h
  M src/core/qgsmaptopixel.cpp
  M src/core/qgsmaptopixel.h
  M src/core/qgsproject.cpp
  M src/core/qgsproviderregistry.cpp
  M src/core/spatialite/spatialite.c
  M src/core/symbology-ng/qgsrendererv2.cpp
  M src/gui/CMakeLists.txt
  M src/gui/qgsmapcanvas.cpp
  M src/providers/grass/CMakeLists.txt
  M src/providers/ogr/qgsogrprovider.cpp
  M src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  M src/python/CMakeLists.txt

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


  Commit: a5d2844463d6e5c39d19d62dcd2d856ad658fbb0
      https://github.com/qgis/Quantum-GIS/commit/a5d2844463d6e5c39d19d62dcd2d856ad658fbb0
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M src/mapserver/qgis_map_serv.cpp
  M src/mapserver/qgshttprequesthandler.cpp
  M src/mapserver/qgswmsserver.cpp

  Log Message:
  -----------
  Added more debugging info to wms server. Also when compiled in debug mode, it will write the last rendered image out to the system temp dir (overwriting it with each render)


Compare: https://github.com/qgis/Quantum-GIS/compare/0c39be6...a5d2844