[QGIS Commit] [qgis/Quantum-GIS] 2414a3: [UI] put wms options for project properties into a...

[noreply at github.com]

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

  Commit: 2414a3abbc97483a5355c262a96c4fc353566bcb
      https://github.com/qgis/Quantum-GIS/commit/2414a3abbc97483a5355c262a96c4fc353566bcb
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-30 (Wed, 30 Nov 2011)

  Changed paths:
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  [UI] put wms options for project properties into a scroll widget so dialog can be resized vertically


  Commit: 78ce3cdc84b79dbec5d227db9ee14af6edf9af66
      https://github.com/qgis/Quantum-GIS/commit/78ce3cdc84b79dbec5d227db9ee14af6edf9af66
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-30 (Wed, 30 Nov 2011)

  Changed paths:
    M CMakeLists.txt
  M cmake_templates/qgsconfig.h.in
  R doc/qgisdoc.css
  M resources/CMakeLists.txt
  A resources/css/CMakeLists.txt
  A resources/css/ie.css
  A resources/css/print.css
  A resources/css/qgisdoc.css
  A resources/css/screen.css
  A resources/html/CMakeLists.txt
  A resources/html/chart.html
  A resources/html/qgsrasterlayer.html
  A resources/js/API.txt
  A resources/js/CMakeLists.txt
  A resources/js/FAQ.txt
  A resources/js/LICENSE.txt
  A resources/js/NEWS.txt
  A resources/js/PLUGINS.txt
  A resources/js/README.txt
  A resources/js/excanvas.js
  A resources/js/excanvas.min.js
  A resources/js/jquery.colorhelpers.js
  A resources/js/jquery.colorhelpers.min.js
  A resources/js/jquery.flot.crosshair.js
  A resources/js/jquery.flot.crosshair.min.js
  A resources/js/jquery.flot.fillbetween.js
  A resources/js/jquery.flot.fillbetween.min.js
  A resources/js/jquery.flot.grow.js
  A resources/js/jquery.flot.image.js
  A resources/js/jquery.flot.image.min.js
  A resources/js/jquery.flot.js
  A resources/js/jquery.flot.min.js
  A resources/js/jquery.flot.navigate.js
  A resources/js/jquery.flot.navigate.min.js
  A resources/js/jquery.flot.pie.js
  A resources/js/jquery.flot.pie.min.js
  A resources/js/jquery.flot.resize.js
  A resources/js/jquery.flot.resize.min.js
  A resources/js/jquery.flot.selection.js
  A resources/js/jquery.flot.selection.min.js
  A resources/js/jquery.flot.stack.js
  A resources/js/jquery.flot.stack.min.js
  A resources/js/jquery.flot.symbol.js
  A resources/js/jquery.flot.symbol.min.js
  A resources/js/jquery.flot.threshold.js
  A resources/js/jquery.flot.threshold.min.js
  A resources/js/jquery.js
  A resources/js/jquery.min.js
  A resources/js/json.js
  M src/app/CMakeLists.txt
  M src/app/main.cpp
  M src/app/qgsrasterlayerproperties.cpp
  M src/app/qgsrasterlayerproperties.h
  M src/core/qgsapplication.cpp
  M src/core/qgsapplication.h
  M src/core/qgsmaplayer.h
  M src/core/qgsproviderregistry.cpp
  M src/core/qgsproviderregistry.h
  M src/core/qgsrasterdataprovider.cpp
  M src/core/raster/qgsrasterlayer.cpp
  M src/mapserver/qgis_map_serv.cpp
  M src/providers/CMakeLists.txt
  M src/providers/delimitedtext/CMakeLists.txt
  M src/providers/gdal/CMakeLists.txt
  M src/providers/gdal/qgsgdalprovider.cpp
  M src/providers/gpx/CMakeLists.txt
  M src/providers/grass/CMakeLists.txt
  M src/providers/memory/CMakeLists.txt
  M src/providers/ogr/CMakeLists.txt
  M src/providers/osm/CMakeLists.txt
  M src/providers/postgres/CMakeLists.txt
  M src/providers/spatialite/CMakeLists.txt
  M src/providers/sqlanywhere/CMakeLists.txt
  M src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  M src/providers/wfs/CMakeLists.txt
  M src/providers/wms/CMakeLists.txt
  M src/ui/qgsrasterlayerpropertiesbase.ui
  M tests/bench/main.cpp

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


  Commit: 5193f60d2adfc8401b0eb6f93218b2ebe9c2255c
      https://github.com/qgis/Quantum-GIS/commit/5193f60d2adfc8401b0eb6f93218b2ebe9c2255c
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2011-11-30 (Wed, 30 Nov 2011)

  Changed paths:
    M CMakeLists.txt
  M cmake_templates/qgsconfig.h.in
  A doc/qgisdoc.css
  M resources/CMakeLists.txt
  R resources/css/CMakeLists.txt
  R resources/css/ie.css
  R resources/css/print.css
  R resources/css/qgisdoc.css
  R resources/css/screen.css
  R resources/html/CMakeLists.txt
  R resources/html/chart.html
  R resources/html/qgsrasterlayer.html
  R resources/js/API.txt
  R resources/js/CMakeLists.txt
  R resources/js/FAQ.txt
  R resources/js/LICENSE.txt
  R resources/js/NEWS.txt
  R resources/js/PLUGINS.txt
  R resources/js/README.txt
  R resources/js/excanvas.js
  R resources/js/excanvas.min.js
  R resources/js/jquery.colorhelpers.js
  R resources/js/jquery.colorhelpers.min.js
  R resources/js/jquery.flot.crosshair.js
  R resources/js/jquery.flot.crosshair.min.js
  R resources/js/jquery.flot.fillbetween.js
  R resources/js/jquery.flot.fillbetween.min.js
  R resources/js/jquery.flot.grow.js
  R resources/js/jquery.flot.image.js
  R resources/js/jquery.flot.image.min.js
  R resources/js/jquery.flot.js
  R resources/js/jquery.flot.min.js
  R resources/js/jquery.flot.navigate.js
  R resources/js/jquery.flot.navigate.min.js
  R resources/js/jquery.flot.pie.js
  R resources/js/jquery.flot.pie.min.js
  R resources/js/jquery.flot.resize.js
  R resources/js/jquery.flot.resize.min.js
  R resources/js/jquery.flot.selection.js
  R resources/js/jquery.flot.selection.min.js
  R resources/js/jquery.flot.stack.js
  R resources/js/jquery.flot.stack.min.js
  R resources/js/jquery.flot.symbol.js
  R resources/js/jquery.flot.symbol.min.js
  R resources/js/jquery.flot.threshold.js
  R resources/js/jquery.flot.threshold.min.js
  R resources/js/jquery.js
  R resources/js/jquery.min.js
  R resources/js/json.js
  M src/app/CMakeLists.txt
  M src/app/main.cpp
  M src/app/qgsrasterlayerproperties.cpp
  M src/app/qgsrasterlayerproperties.h
  M src/core/qgsapplication.cpp
  M src/core/qgsapplication.h
  M src/core/qgsmaplayer.h
  M src/core/qgsproviderregistry.cpp
  M src/core/qgsproviderregistry.h
  M src/core/qgsrasterdataprovider.cpp
  M src/core/raster/qgsrasterlayer.cpp
  M src/mapserver/qgis_map_serv.cpp
  M src/providers/CMakeLists.txt
  M src/providers/delimitedtext/CMakeLists.txt
  M src/providers/gdal/CMakeLists.txt
  M src/providers/gdal/qgsgdalprovider.cpp
  M src/providers/gpx/CMakeLists.txt
  M src/providers/grass/CMakeLists.txt
  M src/providers/memory/CMakeLists.txt
  M src/providers/ogr/CMakeLists.txt
  M src/providers/osm/CMakeLists.txt
  M src/providers/postgres/CMakeLists.txt
  M src/providers/spatialite/CMakeLists.txt
  M src/providers/sqlanywhere/CMakeLists.txt
  M src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  M src/providers/wfs/CMakeLists.txt
  M src/providers/wms/CMakeLists.txt
  M src/ui/qgsrasterlayerpropertiesbase.ui
  M tests/bench/main.cpp

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

This reverts commit 78ce3cdc84b79dbec5d227db9ee14af6edf9af66, reversing
changes made to 2414a3abbc97483a5355c262a96c4fc353566bcb.


Compare: https://github.com/qgis/Quantum-GIS/compare/763caa7...5193f60