[QGIS Commit] [qgis/Quantum-GIS] 8f650e: Resolved merge conflict

[GitHub]

  Branch: refs/heads/release-1_8
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 8f650e904121743e5f1d353ade8caecb7583da4d
      https://github.com/qgis/Quantum-GIS/commit/8f650e904121743e5f1d353ade8caecb7583da4d
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M python/core/qgsmaplayerregistry.sip
  M src/app/gps/qgsgpsinformationwidget.cpp
  M src/app/legend/qgslegend.cpp
  M src/app/legend/qgslegend.h
  M src/app/qgisapp.cpp
  M src/app/qgisapp.h
  M src/core/qgsmaplayerregistry.cpp
  M src/core/qgsmaplayerregistry.h
  M src/core/qgsproject.cpp

  Log Message:
  -----------
  Resolved merge conflict


  Commit: 71225ed0c3e41cb5b9d231925736dfd748b62dee
      https://github.com/qgis/Quantum-GIS/commit/71225ed0c3e41cb5b9d231925736dfd748b62dee
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/app/legend/qgslegend.cpp
  M src/app/qgsnewspatialitelayerdialog.cpp
  M src/browser/qgsbrowser.cpp
  M src/core/qgspluginlayerregistry.cpp
  M src/mapserver/qgswmsserver.cpp
  M src/plugins/georeferencer/qgsgeorefplugingui.cpp
  M src/plugins/offline_editing/offline_editing.cpp
  M src/plugins/roadgraph/exportdlg.cpp
  M src/plugins/spatialquery/qgsspatialquerydialog.cpp
  M src/plugins/sqlanywhere/sqlanywhere.cpp
  M tests/src/core/regression992.cpp
  M tests/src/core/testqgsmaprenderer.cpp
  M tests/src/core/testqgsrasterlayer.cpp
  M tests/src/core/testqgsrenderers.cpp
  M tests/src/core/testqgsvectorlayer.cpp

  Log Message:
  -----------
  [BACKPORT] to 1.8. Remove deprecated use of map layer registry addLayer and removeLayer elsewhere in code base


  Commit: 48cd842f4d579f6f9115bbb76e2f9a2108733219
      https://github.com/qgis/Quantum-GIS/commit/48cd842f4d579f6f9115bbb76e2f9a2108733219
  Author: Juergen E. Fischer <jef at norbit.de>
  Date:   2012-04-04 (Wed, 04 Apr 2012)

  Changed paths:
    M src/app/legend/qgslegend.cpp
  M src/browser/qgsbrowser.cpp
  M src/core/qgspluginlayerregistry.cpp
  M src/mapserver/qgswmsserver.cpp
  M src/plugins/georeferencer/qgsgeorefplugingui.cpp
  M src/plugins/offline_editing/offline_editing.cpp
  M src/plugins/spatialquery/qgsspatialquerydialog.cpp
  M tests/src/core/testqgsmaprenderer.cpp
  M tests/src/core/testqgsrasterlayer.cpp
  M tests/src/core/testqgsrenderers.cpp
  M tests/src/core/testqgsvectorlayer.cpp

  Log Message:
  -----------
  indentation update


Compare: https://github.com/qgis/Quantum-GIS/compare/58007b4...48cd842