[qcustomplot] 01/05: Merge tag 'upstream/1.2.0'

Anton Gladky gladk at moszumanska.debian.org
Thu Apr 3 20:49:42 UTC 2014


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

gladk pushed a commit to branch master
in repository qcustomplot.

commit 79e5ef9009813049c317ca2fa416545cfa12b52a
Merge: 42359b2 b820dfc
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Apr 3 22:32:29 2014 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 changelog.txt                                      |    50 +-
 documentation/html/AxisNamesOverview.png           |   Bin 13680 -> 13683 bytes
 documentation/html/AxisRectSpacingOverview.png     |   Bin 18246 -> 18260 bytes
 documentation/html/InheritanceOverview.png         |   Bin 65329 -> 67817 bytes
 documentation/html/LayoutsystemSketch.png          |   Bin 0 -> 31249 bytes
 documentation/html/LayoutsystemSketch0.png         |   Bin 13659 -> 0 bytes
 documentation/html/LayoutsystemSketch1.png         |   Bin 29530 -> 0 bytes
 documentation/html/QCPBars.png                     |   Bin 2752 -> 2752 bytes
 documentation/html/QCPColorGradient-levelcount.png |   Bin 0 -> 26101 bytes
 documentation/html/QCPColorGradient-periodic.png   |   Bin 0 -> 32523 bytes
 documentation/html/QCPColorGradient.png            |   Bin 0 -> 160210 bytes
 documentation/html/QCPColorMap-interpolate.png     |   Bin 0 -> 13260 bytes
 documentation/html/QCPColorMap-tightboundary.png   |   Bin 0 -> 5508 bytes
 documentation/html/QCPColorMap.png                 |   Bin 0 -> 31115 bytes
 documentation/html/QCPColorScale.png               |   Bin 0 -> 6191 bytes
 documentation/html/QCPCurve.png                    |   Bin 8085 -> 8084 bytes
 documentation/html/QCPGraph.png                    |   Bin 9455 -> 9454 bytes
 documentation/html/QCPItemBracket-length.png       |   Bin 15805 -> 15805 bytes
 documentation/html/QCPItemCurve.png                |   Bin 5618 -> 5618 bytes
 documentation/html/QCPItemEllipse.png              |   Bin 15309 -> 15334 bytes
 documentation/html/QCPItemLine.png                 |   Bin 4052 -> 4052 bytes
 documentation/html/QCPItemPixmap.png               |   Bin 37139 -> 37141 bytes
 documentation/html/QCPItemRect.png                 |   Bin 7118 -> 7118 bytes
 documentation/html/QCPItemText.png                 |   Bin 20619 -> 20723 bytes
 documentation/html/QCPItemTracer.png               |   Bin 4178 -> 4178 bytes
 documentation/html/QCPLineEnding.png               |   Bin 7578 -> 7578 bytes
 documentation/html/QCPStatisticalBox.png           |   Bin 4059 -> 4059 bytes
 documentation/html/RelationOverview.png            |   Bin 52327 -> 55973 bytes
 documentation/html/adaptive-sampling-line.png      |   Bin 0 -> 10472 bytes
 documentation/html/adaptive-sampling-scatter.png   |   Bin 0 -> 15947 bytes
 documentation/html/annotated.html                  |    68 +-
 documentation/html/axis_8h_source.html             |   800 +-
 documentation/html/classQCPAbstractItem.html       |   361 +-
 documentation/html/classQCPAbstractLegendItem.html |  1014 +-
 documentation/html/classQCPAbstractPlottable.html  |   434 +-
 .../classQCPAbstractPlottable__inherit__graph.png  |   Bin 9119 -> 10655 bytes
 documentation/html/classQCPAxis.html               |   715 +-
 documentation/html/classQCPAxisRect.html           |  1022 +-
 documentation/html/classQCPBars.html               |  1515 +-
 documentation/html/classQCPColorGradient.html      |   452 +
 documentation/html/classQCPColorMap.html           |   790 +
 documentation/html/classQCPColorMapData.html       |   516 +
 .../html/classQCPColorMap__inherit__graph.png      |   Bin 0 -> 4192 bytes
 documentation/html/classQCPColorScale.html         |   654 +
 .../html/classQCPColorScale__inherit__graph.png    |   Bin 0 -> 3730 bytes
 documentation/html/classQCPCurve.html              |  1512 +-
 documentation/html/classQCPGraph.html              |  1802 +-
 documentation/html/classQCPGrid.html               |   553 +-
 documentation/html/classQCPItemBracket.html        |   997 +-
 documentation/html/classQCPItemCurve.html          |  1028 +-
 documentation/html/classQCPItemEllipse.html        |   997 +-
 documentation/html/classQCPItemLine.html           |  1028 +-
 documentation/html/classQCPItemPixmap.html         |   997 +-
 documentation/html/classQCPItemPosition.html       |    67 +-
 documentation/html/classQCPItemRect.html           |   997 +-
 documentation/html/classQCPItemStraightLine.html   |  1028 +-
 documentation/html/classQCPItemText.html           |   997 +-
 documentation/html/classQCPItemTracer.html         |  1028 +-
 documentation/html/classQCPLayer.html              |    21 +
 documentation/html/classQCPLayerable.html          |    45 +-
 .../html/classQCPLayerable__inherit__graph.png     |   Bin 68500 -> 74539 bytes
 documentation/html/classQCPLayout.html             |  1226 +-
 documentation/html/classQCPLayoutElement.html      |   532 +-
 .../html/classQCPLayoutElement__inherit__graph.png |   Bin 16333 -> 17630 bytes
 documentation/html/classQCPLayoutGrid.html         |  1411 +-
 documentation/html/classQCPLayoutInset.html        |  1435 +-
 documentation/html/classQCPLegend.html             |  1990 +--
 documentation/html/classQCPLineEnding.html         |     4 +-
 documentation/html/classQCPPainter.html            |     2 +-
 documentation/html/classQCPPlotTitle.html          |  1015 +-
 .../html/classQCPPlottableLegendItem.html          |  1420 +-
 documentation/html/classQCPRange.html              |   331 +-
 documentation/html/classQCPStatisticalBox.html     |  1521 +-
 documentation/html/classQCustomPlot.html           |   193 +-
 documentation/html/classes.html                    |    44 +-
 documentation/html/colorgradient_8h_source.html    |   124 +
 documentation/html/core_8h_source.html             |   378 +-
 .../html/dir_68267d1309a1af8e8297ef4c3efbcdba.html |     2 +
 .../html/dir_78a97038723513eb3e3a9e944a7f482f.html |     2 +
 .../html/dir_d1ab82e73f77cddd99808c625b504457.html |     2 +
 documentation/html/files.html                      |    39 +-
 documentation/html/functions.html                  |    10 +-
 documentation/html/functions_0x63.html             |    42 +-
 documentation/html/functions_0x64.html             |    71 +-
 documentation/html/functions_0x66.html             |     3 +
 documentation/html/functions_0x67.html             |    99 +-
 documentation/html/functions_0x69.html             |    13 +-
 documentation/html/functions_0x6c.html             |    17 +-
 documentation/html/functions_0x6d.html             |    13 +-
 documentation/html/functions_0x6f.html             |    32 +-
 documentation/html/functions_0x70.html             |     7 +-
 documentation/html/functions_0x71.html             |    18 +-
 documentation/html/functions_0x72.html             |    35 +-
 documentation/html/functions_0x73.html             |   176 +-
 documentation/html/functions_0x75.html             |    32 +-
 documentation/html/functions_0x77.html             |     1 +
 .../{functions_0x6f.html => functions_0x78.html}   |    10 +-
 .../{functions_0x6f.html => functions_0x79.html}   |    10 +-
 documentation/html/functions_enum.html             |    12 +
 documentation/html/functions_eval.html             |    76 +
 documentation/html/functions_func.html             |    14 +-
 documentation/html/functions_func_0x63.html        |    33 +-
 documentation/html/functions_func_0x64.html        |    71 +-
 documentation/html/functions_func_0x66.html        |     3 +
 documentation/html/functions_func_0x67.html        |    59 +-
 documentation/html/functions_func_0x69.html        |    11 +-
 documentation/html/functions_func_0x6c.html        |     6 +
 documentation/html/functions_func_0x6d.html        |    15 +-
 documentation/html/functions_func_0x6f.html        |    20 +-
 documentation/html/functions_func_0x70.html        |    11 +-
 documentation/html/functions_func_0x71.html        |    18 +-
 documentation/html/functions_func_0x72.html        |    22 +-
 documentation/html/functions_func_0x73.html        |   168 +-
 documentation/html/functions_func_0x75.html        |    20 +-
 documentation/html/functions_func_0x77.html        |     1 +
 .../{functions_vars.html => functions_rela.html}   |    16 +-
 documentation/html/functions_vars.html             |    15 +
 documentation/html/global_8h_source.html           |   219 +-
 documentation/html/hierarchy.html                  |    80 +-
 documentation/html/index.html                      |    14 +-
 documentation/html/inherit_graph_1.png             |   Bin 1099 -> 1188 bytes
 documentation/html/inherit_graph_10.png            |   Bin 1203 -> 937 bytes
 documentation/html/inherit_graph_11.png            |   Bin 1011 -> 1040 bytes
 .../{inherit_graph_10.png => inherit_graph_12.png} |   Bin
 .../{inherit_graph_11.png => inherit_graph_13.png} |   Bin
 documentation/html/inherit_graph_2.png             |   Bin 768 -> 1083 bytes
 documentation/html/inherit_graph_3.png             |   Bin 1926 -> 1099 bytes
 documentation/html/inherit_graph_4.png             |   Bin 941 -> 768 bytes
 documentation/html/inherit_graph_5.png             |   Bin 68070 -> 1926 bytes
 documentation/html/inherit_graph_6.png             |   Bin 1011 -> 941 bytes
 documentation/html/inherit_graph_7.png             |   Bin 1347 -> 73967 bytes
 documentation/html/inherit_graph_8.png             |   Bin 937 -> 1011 bytes
 documentation/html/inherit_graph_9.png             |   Bin 1040 -> 1347 bytes
 documentation/html/inherits.html                   |    32 +-
 documentation/html/item-bracket_8h_source.html     |     6 +-
 documentation/html/item-curve_8h_source.html       |     6 +-
 documentation/html/item-ellipse_8h_source.html     |     6 +-
 documentation/html/item-line_8h_source.html        |     6 +-
 documentation/html/item-pixmap_8h_source.html      |     6 +-
 documentation/html/item-rect_8h_source.html        |     6 +-
 .../html/item-straightline_8h_source.html          |     6 +-
 documentation/html/item-text_8h_source.html        |     6 +-
 documentation/html/item-tracer_8h_source.html      |     6 +-
 documentation/html/item_8h_source.html             |   239 +-
 documentation/html/layer_8h_source.html            |   191 +-
 documentation/html/layout_8h_source.html           |   438 +-
 .../html/layoutelement-axisrect_8h_source.html     |    10 +-
 .../html/layoutelement-colorscale_8h_source.html   |   169 +
 .../html/layoutelement-legend_8h_source.html       |   344 +-
 .../html/layoutelement-plottitle_8h_source.html    |    73 +-
 .../html/layoutsystem-multipleaxisrects.png        |   Bin 10326 -> 10259 bytes
 documentation/html/lineending_8h_source.html       |     6 +-
 documentation/html/namespaceQCP.html               |     2 +-
 documentation/html/painter_8h_source.html          |    14 +-
 documentation/html/plottable-bars_8h_source.html   |    10 +-
 .../html/plottable-colormap_8h_source.html         |   189 +
 documentation/html/plottable-curve_8h_source.html  |    14 +-
 documentation/html/plottable-graph_8h_source.html  |   248 +-
 .../html/plottable-statisticalbox_8h_source.html   |    10 +-
 documentation/html/plottable_8h_source.html        |   111 +-
 documentation/html/qcp_8h_source.html              |    45 +-
 documentation/html/qt.css                          |    22 +-
 documentation/html/range_8h_source.html            |   101 +-
 documentation/html/ssDisc.png                      |   Bin 253 -> 253 bytes
 documentation/html/thelayoutsystem.html            |    33 +-
 documentation/qcustomplot.qch                      |   Bin 2049024 -> 2066432 bytes
 examples/plots/balboa.jpg                          |   Bin 0 -> 37699 bytes
 examples/plots/dali.png                            |   Bin 485785 -> 0 bytes
 examples/plots/main.cpp                            |     6 +-
 examples/plots/mainwindow.cpp                      |    82 +-
 examples/plots/mainwindow.h                        |     7 +-
 .../scrollbar-axis-range-control/mainwindow.cpp    |     6 +-
 examples/scrollbar-axis-range-control/mainwindow.h |     6 +-
 examples/text-document-integration/mainwindow.cpp  |     6 +-
 examples/text-document-integration/mainwindow.h    |     6 +-
 .../qcpdocumentobject.cpp                          |     6 +-
 .../text-document-integration/qcpdocumentobject.h  |     6 +-
 qcustomplot.cpp                                    | 16395 +++++++++++--------
 qcustomplot.h                                      |  2288 ++-
 179 files changed, 19176 insertions(+), 36645 deletions(-)

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



More information about the debian-science-commits mailing list