[qcustomplot] 02/07: Merge tag 'upstream/1.2.1'

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository qcustomplot.

commit 742a032c749f3538e8c750c8d6d33d3a09acd973
Merge: a7ba55c 95aa0fd
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Jul 21 22:01:12 2014 +0200

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 changelog.txt                                      |   5 +++++
 documentation/html/axis_8h_source.html             |   4 ++--
 documentation/html/colorgradient_8h_source.html    |   4 ++--
 documentation/html/core_8h_source.html             |   4 ++--
 documentation/html/global_8h_source.html           |   4 ++--
 documentation/html/index.html                      |   4 ++--
 documentation/html/item-bracket_8h_source.html     |   4 ++--
 documentation/html/item-curve_8h_source.html       |   4 ++--
 documentation/html/item-ellipse_8h_source.html     |   4 ++--
 documentation/html/item-line_8h_source.html        |   4 ++--
 documentation/html/item-pixmap_8h_source.html      |   4 ++--
 documentation/html/item-rect_8h_source.html        |   4 ++--
 .../html/item-straightline_8h_source.html          |   4 ++--
 documentation/html/item-text_8h_source.html        |   4 ++--
 documentation/html/item-tracer_8h_source.html      |   4 ++--
 documentation/html/item_8h_source.html             |   4 ++--
 documentation/html/layer_8h_source.html            |   4 ++--
 documentation/html/layout_8h_source.html           |   4 ++--
 .../html/layoutelement-axisrect_8h_source.html     |   4 ++--
 .../html/layoutelement-colorscale_8h_source.html   |   4 ++--
 .../html/layoutelement-legend_8h_source.html       |   4 ++--
 .../html/layoutelement-plottitle_8h_source.html    |   4 ++--
 documentation/html/lineending_8h_source.html       |   4 ++--
 documentation/html/painter_8h_source.html          |   4 ++--
 documentation/html/plottable-bars_8h_source.html   |   4 ++--
 .../html/plottable-colormap_8h_source.html         |   4 ++--
 documentation/html/plottable-curve_8h_source.html  |   4 ++--
 documentation/html/plottable-graph_8h_source.html  |   4 ++--
 .../html/plottable-statisticalbox_8h_source.html   |   4 ++--
 documentation/html/plottable_8h_source.html        |   4 ++--
 documentation/html/qcp_8h_source.html              |   4 ++--
 documentation/html/range_8h_source.html            |   4 ++--
 documentation/qcustomplot.qch                      | Bin 2066432 -> 2066432 bytes
 examples/plots/main.cpp                            |   4 ++--
 examples/plots/mainwindow.cpp                      |   4 ++--
 examples/plots/mainwindow.h                        |   4 ++--
 .../scrollbar-axis-range-control/mainwindow.cpp    |   4 ++--
 examples/scrollbar-axis-range-control/mainwindow.h |   4 ++--
 examples/text-document-integration/mainwindow.cpp  |   4 ++--
 examples/text-document-integration/mainwindow.h    |   4 ++--
 .../qcpdocumentobject.cpp                          |   4 ++--
 .../text-document-integration/qcpdocumentobject.h  |   4 ++--
 qcustomplot.cpp                                    |   8 ++++----
 qcustomplot.h                                      |   4 ++--
 44 files changed, 91 insertions(+), 86 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qcustomplot.git