[QGIS Commit] [qgis/Quantum-GIS] 54754f: 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: 54754f159519d91a968217e272f3b35a14edbc4f
      https://github.com/qgis/Quantum-GIS/commit/54754f159519d91a968217e272f3b35a14edbc4f
  Author: marco <marco at marco-laptop.(none)>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M src/app/qgsbrowserdockwidget.cpp
  M src/browser/qgsbrowser.cpp
  M src/core/qgsdataitem.cpp
  M src/core/qgsdataitem.h
  M src/providers/postgres/qgspostgresdataitems.cpp
  M src/providers/wfs/qgswfsdataitems.cpp
  M src/providers/wms/CMakeLists.txt
  A src/providers/wms/qgswmsdataitems.cpp
  A src/providers/wms/qgswmsdataitems.h
  M src/providers/wms/qgswmsprovider.cpp
  M src/providers/wms/qgswmsprovider.h

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


  Commit: b3bebf3a9f6bd92b64220fcfefcaaedee90e30d3
      https://github.com/qgis/Quantum-GIS/commit/b3bebf3a9f6bd92b64220fcfefcaaedee90e30d3
  Author: marco <marco at marco-laptop.(none)>
  Date:   2011-10-15 (Sat, 15 Oct 2011)

  Changed paths:
    M src/mapserver/qgsconfigparser.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

  Log Message:
  -----------
  WMS server: avoid reading layer symbology if the request does not come from SLD


Compare: https://github.com/qgis/Quantum-GIS/compare/fb6d551...b3bebf3