[gnuplot] 01/04: Merge.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gnuplot.

commit 7608f6a0e5955f04855fd2b556ecb55830261b58
Merge: e06b554 1ebeecc
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Aug 1 23:34:17 2016 +0200

    Merge.

 ChangeLog                          | 349 ++++++++++++++++++++++++++++++++++++-
 NEWS                               |  25 +++
 PATCHLEVEL                         |   2 +-
 RELEASE_NOTES                      |  77 ++++----
 config/mingw/Makefile              | 187 ++++++++++++++++----
 configure.in                       |  17 +-
 demo/plugin/Makefile.am            |   5 +
 demo/plugin/Makefile.in            |   5 +
 docs/gnuplot.doc                   |  34 ++--
 docs/titlepag.tex                  |   4 +-
 src/axis.c                         |  17 +-
 src/axis.h                         |  13 +-
 src/datablock.c                    |   7 +-
 src/datafile.c                     |  90 ++++++----
 src/datafile.h                     |   3 +-
 src/fit.c                          |  28 +--
 src/gadgets.c                      |  36 ++--
 src/graph3d.c                      |  10 +-
 src/graphics.c                     | 204 +++++++++++++---------
 src/graphics.h                     |   7 +-
 src/history.c                      |   8 +-
 src/internal.c                     |  15 +-
 src/mouse.c                        |   4 +-
 src/parse.h                        |   6 +-
 src/plot2d.c                       | 166 +++++++-----------
 src/plot3d.c                       |  10 +-
 src/qtterminal/QtGnuplotScene.cpp  |  23 ++-
 src/qtterminal/QtGnuplotScene.h    |   1 +
 src/qtterminal/QtGnuplotWindow.cpp |   5 +-
 src/qtterminal/qt_term.cpp         |  18 +-
 src/save.c                         |   4 +-
 src/scanner.c                      |   6 +-
 src/set.c                          |   8 +-
 src/stats.c                        |  20 ++-
 src/term.c                         |  12 +-
 src/term.h                         |  10 +-
 src/term_api.h                     |   1 +
 src/version.c                      |   6 +-
 src/wxterminal/gp_cairo.c          |  17 +-
 src/wxterminal/wxt_gui.h           |  14 +-
 term/aquaterm.trm                  |  12 +-
 term/caca.trm                      |   8 +-
 term/cairo.trm                     |   4 +-
 term/emf.trm                       |  39 +++--
 term/js/gnuplot_svg.js             |  31 ++--
 term/pslatex.trm                   |  22 ++-
 term/svg.trm                       |   4 +-
 term/tkcanvas.trm                  |   6 +-
 48 files changed, 1116 insertions(+), 484 deletions(-)

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