[QGIS Commit] [qgis/Quantum-GIS] 8435d7: Merge pull request #54 from NathanW2/expression-ui

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS

  Commit: 8435d7c35acd35e9e00c48972b6e10b8be82515a
      https://github.com/qgis/Quantum-GIS/commit/8435d7c35acd35e9e00c48972b6e10b8be82515a
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M src/app/qgslabelinggui.cpp
  M src/core/qgspallabeling.cpp
  M src/gui/qgsexpressionbuilderwidget.cpp
  M src/ui/qgsexpressionbuilder.ui
  M src/ui/qgslabelingguibase.ui

  Log Message:
  -----------
  Merge pull request #54 from NathanW2/expression-ui

Remove multiline label option and make it default and expression builder UI tweaks.