[gnuplot] 01/03: 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 712f9b0bbfd8ff8ada7b2aa04808087e9bc5a5e9
Merge: 0e28d3f aec9b9b
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Feb 28 23:16:55 2014 +0100

    Merge.

 ChangeLog                         | 300 +++++++++++++++++++
 FAQ.pdf                           | Bin 220365 -> 168035 bytes
 NEWS                              |  30 +-
 PATCHLEVEL                        |   2 +-
 configure.in                      |  31 +-
 demo/Makefile.am                  |   8 +-
 demo/Makefile.in                  |   8 +-
 demo/clipobject.dem               |  79 +++++
 demo/datastrings.dem              |   6 +-
 demo/timedat.dem                  |  24 +-
 docs/gnuplot-ja.doc               | 132 ++++++---
 docs/gnuplot.doc                  |  68 ++++-
 docs/gnuplot.pdf                  | Bin 1577735 -> 1589954 bytes
 docs/gnuplot.texi                 |  97 +++++-
 docs/term-ja.diff                 | 489 +++++++++++++++---------------
 docs/titlepag.tex                 |  13 +-
 src/Makefile.am                   |   2 +-
 src/axis.c                        |   5 +-
 src/bitmap.c                      |  54 ++--
 src/color.h                       |   5 +-
 src/command.c                     |  18 +-
 src/datafile.c                    |  74 +++--
 src/datafile.h                    |   8 +-
 src/fit.c                         |   4 +-
 src/gadgets.h                     |  17 +-
 src/getcolor.c                    |  45 ++-
 src/gp_types.h                    |   6 +-
 src/graph3d.c                     |  20 +-
 src/graphics.c                    |  90 ++++--
 src/graphics.h                    |   4 +-
 src/hidden3d.c                    |   3 +-
 src/interpol.c                    | 149 +++++++++-
 src/interpol.h                    |   4 +-
 src/misc.c                        |   5 +-
 src/mouse.c                       |   6 +-
 src/parse.c                       |  14 +-
 src/plot.c                        |  24 +-
 src/plot2d.c                      |  69 ++++-
 src/plot3d.c                      |  14 +-
 src/pm3d.c                        |  20 +-
 src/qtterminal/QtGnuplotScene.cpp |  17 +-
 src/qtterminal/qt_term.cpp        |  29 +-
 src/readline.c                    |  43 +--
 src/save.c                        |  45 +--
 src/set.c                         |  87 ++++--
 src/show.c                        |   4 +-
 src/tables.c                      |   4 +-
 src/term.c                        |   6 +-
 src/time.c                        |   4 +-
 src/unset.c                       |   4 +-
 src/util.c                        |  10 +-
 src/version.c                     |   8 +-
 src/win/wgraph.c                  |  80 ++---
 src/win/winmain.c                 |  58 ++--
 src/win/wtext.c                   |  12 +-
 src/wxterminal/gp_cairo.c         |   8 +-
 src/wxterminal/wxt_gui.cpp        |  18 +-
 src/wxterminal/wxt_gui.h          |   7 +-
 term/emf.trm                      |  97 +++++-
 term/gd.trm                       |   3 +-
 term/svg.trm                      |   5 +-
 term/tek.trm                      | 609 +++++++++++++++++++++++++++++++++++++-
 term/win.trm                      |   6 +-
 win/README-Windows-ja.txt         |   4 +-
 win/README-Windows.txt            |  14 +-
 win/gnuplot.iss                   |  10 +-
 66 files changed, 2417 insertions(+), 722 deletions(-)

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