[QGIS Commit] [qgis/Quantum-GIS] aa43c9: refs #7408

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: aa43c9237669bd3a63b78bcee0f1f348abc2bca3
      https://github.com/qgis/Quantum-GIS/commit/aa43c9237669bd3a63b78bcee0f1f348abc2bca3
  Author: Hugo Mercier <hugo.mercier at oslandia.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/core/composer/qgsatlascomposition.cpp

  Log Message:
  -----------
  refs #7408
Fix error reporting when the filename expression is invalid


  Commit: a482c42a7689d2afc3f94e00d9698abbf0537f98
      https://github.com/qgis/Quantum-GIS/commit/a482c42a7689d2afc3f94e00d9698abbf0537f98
  Author: Hugo Mercier <hugo.mercier at oslandia.com>
  Date:   2013-03-21 (Thu, 21 Mar 2013)

  Changed paths:
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgsatlascomposition.h
    M src/ui/qgsatlascompositionwidgetbase.ui

  Log Message:
  -----------
  refs #7408
[Atlas] Add a checkbox on "filter with"


  Commit: 53c47dd8e4ab8705fc9d548187d3f3a47e6943e3
      https://github.com/qgis/Quantum-GIS/commit/53c47dd8e4ab8705fc9d548187d3f3a47e6943e3
  Author: Jürgen Fischer <jef at norbit.de>
  Date:   2013-03-26 (Tue, 26 Mar 2013)

  Changed paths:
    M src/app/composer/qgsatlascompositionwidget.cpp
    M src/app/composer/qgsatlascompositionwidget.h
    M src/core/composer/qgsatlascomposition.cpp
    M src/core/composer/qgsatlascomposition.h
    M src/ui/qgsatlascompositionwidgetbase.ui

  Log Message:
  -----------
  Merge pull request #473 from Oslandia/atlas

Atlas: fix #7408


Compare: https://github.com/qgis/Quantum-GIS/compare/250cc4ecb161...53c47dd8e4ab