[QGIS Commit] [qgis/Quantum-GIS] af0782: Revert "indentation update"

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: af0782d7d540ee8f270ccb4775196b1827969c06
      https://github.com/qgis/Quantum-GIS/commit/af0782d7d540ee8f270ccb4775196b1827969c06
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/app/composer/qgscomposermapwidget.cpp
    M src/core/composer/qgscomposerhtml.cpp
    M src/core/composer/qgscomposerlabel.cpp
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgslegendmodel.cpp
    M src/core/qgscoordinatereferencesystem.cpp
    M src/core/qgscoordinatetransform.cpp
    M src/core/qgsexpression.cpp
    M src/core/qgsgeometry.cpp
    M src/gui/qgscomposerview.cpp
    M src/mapserver/qgswfsserver.cpp
    M src/providers/gdal/qgsgdalprovider.cpp
    M tests/src/core/testqgscomposerlabel.cpp
    M tests/src/core/testqgscomposermapatlas.cpp
    M tests/src/core/testqgsexpression.cpp

  Log Message:
  -----------
  Revert "indentation update"

This reverts commit 7dd58aa8f62022e710e03af78cfd7d7ce08e83f5.


  Commit: a654e274a352ef29354de0bcb13e96444868c806
      https://github.com/qgis/Quantum-GIS/commit/a654e274a352ef29354de0bcb13e96444868c806
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M python/core/composer/qgscomposition.sip
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h

  Log Message:
  -----------
  Resolved merge conflicts when reverting 686f632


  Commit: 8a1953b9e710ea25dac502b32eab9e0e8d652b10
      https://github.com/qgis/Quantum-GIS/commit/8a1953b9e710ea25dac502b32eab9e0e8d652b10
  Author: Tim Sutton <tim at linfiniti.com>
  Date:   2012-10-01 (Mon, 01 Oct 2012)

  Changed paths:
    M python/core/qgsexpression.sip
    M src/app/composer/qgscomposer.cpp
    M src/app/composer/qgscomposerlabelwidget.cpp
    M src/app/composer/qgscomposerlabelwidget.h
    M src/app/composer/qgscomposermapwidget.cpp
    M src/app/composer/qgscomposermapwidget.h
    M src/core/composer/qgscomposeritem.h
    M src/core/composer/qgscomposerlabel.cpp
    M src/core/composer/qgscomposerlabel.h
    M src/core/composer/qgscomposermap.cpp
    M src/core/composer/qgscomposermap.h
    M src/core/composer/qgscomposition.cpp
    M src/core/composer/qgscomposition.h
    M src/core/qgsexpression.cpp
    M src/core/qgsexpression.h
    M src/core/qgsexpressionparser.yy
    M src/gui/qgscomposerview.cpp
    M src/gui/qgsexpressionbuilderwidget.cpp
    M src/ui/qgscomposerlabelwidgetbase.ui
    M src/ui/qgscomposerlegendwidgetbase.ui
    M src/ui/qgscomposermapwidgetbase.ui
    M tests/src/core/CMakeLists.txt
    R tests/src/core/testqgscomposerlabel.cpp
    R tests/src/core/testqgscomposermapatlas.cpp
    M tests/src/core/testqgsexpression.cpp
    R tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
    R tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
    R tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
    R tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
    R tests/testdata/control_images/expected_composermapatlas/hiding_0.png
    R tests/testdata/control_images/expected_composermapatlas/hiding_1.png
    R tests/testdata/france_parts.dbf
    R tests/testdata/france_parts.prj
    R tests/testdata/france_parts.qpj
    R tests/testdata/france_parts.shp
    R tests/testdata/france_parts.shx

  Log Message:
  -----------
  Revert "Merge pull request #245 from Oslandia/atlas_integration"

This reverts commit fe8385e7f5735507adf1acfcce81a399fa6bc6f5, reversing
changes made to 23352ce0d66855a4a9c403a81feaa1884415e45c.


Compare: https://github.com/qgis/Quantum-GIS/compare/4b263d6b0640...8a1953b9e710