[QGIS Commit] [qgis/Quantum-GIS] e67648: 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: e67648a0ab95139aff46a87d715d37475fa91fd4
      https://github.com/qgis/Quantum-GIS/commit/e67648a0ab95139aff46a87d715d37475fa91fd4
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2011-07-11 (Mon, 11 Jul 2011)

  Changed paths:
    M ms-windows/osgeo4w/package-nightly.cmd
  M src/app/CMakeLists.txt
  M src/app/qgisapp.cpp
  M src/app/qgisapp.h
  A src/app/qgsbrowserdockwidget.cpp
  A src/app/qgsbrowserdockwidget.h
  M src/browser/CMakeLists.txt
  R src/browser/qgsbrowsermodel.cpp
  R src/browser/qgsbrowsermodel.h
  M src/core/CMakeLists.txt
  A src/core/qgsbrowsermodel.cpp
  A src/core/qgsbrowsermodel.h

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


  Commit: 62e62f652d63d8cf2eaca13365d5022324ad5787
      https://github.com/qgis/Quantum-GIS/commit/62e62f652d63d8cf2eaca13365d5022324ad5787
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2011-07-12 (Tue, 12 Jul 2011)

  Changed paths:
    M src/mapserver/qgsprojectparser.cpp

  Log Message:
  -----------
  Add Service element when taking contact information from the project file


Compare: https://github.com/qgis/Quantum-GIS/compare/f57bef4...62e62f6