[QGIS Commit] [qgis/Quantum-GIS] dbad87: [FEATURE]: possibility to overwrite wms url for ca...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: dbad8734885e3f340ce62240404ed77b880f46bc
      https://github.com/qgis/Quantum-GIS/commit/dbad8734885e3f340ce62240404ed77b880f46bc
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M src/app/qgsprojectproperties.cpp
    M src/mapserver/qgsconfigparser.h
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsprojectparser.h
    M src/mapserver/qgswmsserver.cpp
    M src/mapserver/qgswmsserver.h
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  [FEATURE]: possibility to overwrite wms url for capabilities document in project properties


  Commit: 46d40c4490a5ca1f0bf9a651da6d794f5c884f70
      https://github.com/qgis/Quantum-GIS/commit/46d40c4490a5ca1f0bf9a651da6d794f5c884f70
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M src/app/qgsprojectproperties.cpp
    M src/mapserver/qgsconfigparser.h
    M src/mapserver/qgsprojectparser.cpp
    M src/mapserver/qgsprojectparser.h
    M src/mapserver/qgswmsserver.cpp
    M src/mapserver/qgswmsserver.h
    M src/ui/qgsprojectpropertiesbase.ui

  Log Message:
  -----------
  Merge branch 'wms_address'


Compare: https://github.com/qgis/Quantum-GIS/compare/ec87f7f8eb8b...46d40c4490a5