[QGIS Commit] [qgis/Quantum-GIS] c4cbcf: Merge ellipse symbollayer branch

[noreply at github.com]

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

  Commit: c4cbcf4ebf8e7bc265c1dd4ddfe809966e9c70c6
      https://github.com/qgis/Quantum-GIS/commit/c4cbcf4ebf8e7bc265c1dd4ddfe809966e9c70c6
  Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
  Date:   2011-07-19 (Tue, 19 Jul 2011)

  Changed paths:
    M python/core/symbology-ng-core.sip
  M python/gui/symbology-ng-gui.sip
  M src/app/qgsannotationwidget.cpp
  M src/core/CMakeLists.txt
  M src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  A src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  A src/core/symbology-ng/qgsellipsesymbollayerv2.h
  M src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  M src/core/symbology-ng/qgslinesymbollayerv2.cpp
  M src/core/symbology-ng/qgsrendererv2.cpp
  M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  M src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  M src/core/symbology-ng/qgssymbollayerv2.h
  M src/core/symbology-ng/qgssymbollayerv2registry.cpp
  M src/core/symbology-ng/qgssymbollayerv2registry.h
  M src/core/symbology-ng/qgssymbolv2.cpp
  M src/core/symbology-ng/qgssymbolv2.h
  M src/gui/CMakeLists.txt
  M src/gui/qgsannotationitem.cpp
  M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  A src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  A src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  M src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  M src/gui/symbology-ng/qgssymbollayerv2widget.h
  M src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
  M src/gui/symbology-ng/qgssymbolv2propertiesdialog.h
  M src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  M src/gui/symbology-ng/qgssymbolv2selectordialog.h
  M src/mapserver/qgswmsserver.cpp
  M src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
  M src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h
  M src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
  A src/ui/symbollayer/widget_ellipse.ui

  Log Message:
  -----------
  Merge ellipse symbollayer branch