[QGIS Commit] [qgis/Quantum-GIS] 1fdacc: Remove merge conflict

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 1fdacc5feb96da58f43be603a634da74ff54b816
      https://github.com/qgis/Quantum-GIS/commit/1fdacc5feb96da58f43be603a634da74ff54b816
  Author: Matthias Kuhn <kk at kk-office.gslwd>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/core/qgsvectorlayer.cpp
    M src/gui/qgsmapcanvas.cpp

  Log Message:
  -----------
  Remove merge conflict


  Commit: 7a0467d4a04bcca6463c26a4a4ce0babeca8f99d
      https://github.com/qgis/Quantum-GIS/commit/7a0467d4a04bcca6463c26a4a4ce0babeca8f99d
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/gui/qgsmapcanvas.cpp
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  Remove merge conflict


  Commit: 677cea0bdce3a9879e3e5c2f1d5fc38811f570e1
      https://github.com/qgis/Quantum-GIS/commit/677cea0bdce3a9879e3e5c2f1d5fc38811f570e1
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/gui/qgsmapcanvas.cpp
    M src/gui/qgsmapcanvas.h

  Log Message:
  -----------
  Remove merge conflict


  Commit: 295c464f90f6b6a056181e37f19ebcc31b80820d
      https://github.com/qgis/Quantum-GIS/commit/295c464f90f6b6a056181e37f19ebcc31b80820d
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/core/qgsvectorlayer.cpp
    M src/gui/qgsmapcanvas.cpp

  Log Message:
  -----------
  Diabled backbuffering choice on any other system than X11


  Commit: 02f06f99686a17182bf9cda71ae08d1596292290
      https://github.com/qgis/Quantum-GIS/commit/02f06f99686a17182bf9cda71ae08d1596292290
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsoptions.cpp
    M src/app/qgsoptions.h
    M src/core/qgsvectorlayer.cpp
    M src/gui/qgsmapcanvas.cpp
    M src/ui/qgsoptionsbase.ui

  Log Message:
  -----------
  Enable backbuffering / incremental drawing features only on supported platforms
Correct typo


  Commit: 55d332b1ff4cb2a8c90cac6a13debfcc4d53fc47
      https://github.com/qgis/Quantum-GIS/commit/55d332b1ff4cb2a8c90cac6a13debfcc4d53fc47
  Author: Matthias Kuhn <matthias.kuhn at gmx.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/gui/qgsmapcanvas.cpp

  Log Message:
  -----------
  Remove unneede variable


  Commit: 487879df520e74fed0e0cd06a909b6025ae00c43
      https://github.com/qgis/Quantum-GIS/commit/487879df520e74fed0e0cd06a909b6025ae00c43
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M src/app/qgsoptions.cpp

  Log Message:
  -----------
  Keep checkbox in sync if enableBackbuffer option not yet used


Compare: https://github.com/qgis/Quantum-GIS/compare/f5ff7c222b53...487879df520e