[QGIS Commit] [qgis/Quantum-GIS] 96f773: Merge branch 'expr'

[noreply at github.com]

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

  Commit: 96f773602138b3ca8579a4611c4ebfee11c7e0ed
      https://github.com/qgis/Quantum-GIS/commit/96f773602138b3ca8579a4611c4ebfee11c7e0ed
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2011-08-27 (Sat, 27 Aug 2011)

  Changed paths:
    M python/core/core.sip
  A python/core/qgsexpression.sip
  M python/core/symbology-ng-core.sip
  M src/app/attributetable/qgsattributetabledialog.cpp
  M src/app/qgsattributedialog.cpp
  M src/app/qgsfieldcalculator.cpp
  M src/core/CMakeLists.txt
  A src/core/qgsexpression.cpp
  A src/core/qgsexpression.h
  A src/core/qgsexpressionlexer.ll
  A src/core/qgsexpressionparser.yy
  M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  M src/core/symbology-ng/qgsrulebasedrendererv2.h
  M src/gui/qgssearchquerybuilder.cpp
  M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  M tests/src/core/CMakeLists.txt
  A tests/src/core/testqgsexpression.cpp

  Log Message:
  -----------
  Merge branch 'expr'