[ncview] 11/31: Merge tag 'upstream/2.1.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository ncview.

commit 80503fc56e4126e930a3e1686cac87921344bfa2
Merge: c9b53c1 c2bc40b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 18 01:40:32 2015 +0200

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1

 src/SciPlot.c                   |  65 +++---
 src/SciPlot.h                   |   2 +-
 src/SciPlotP.h                  |   2 +-
 src/do_print.orig.c             | 447 ----------------------------------------
 src/epic_time.c                 |   5 +-
 src/file_netcdf.c               |  77 ++++---
 src/handle_rc_file.c            |  29 ++-
 src/interface/cbar.c            |   6 +-
 src/interface/colormap_funcs.c  |   8 +-
 src/interface/display_info.c    |   2 +-
 src/interface/filesel.c         |   6 +-
 src/interface/plot_range.c      |   4 +-
 src/interface/plot_xy.c         |   8 +-
 src/interface/printer_options.c |  10 +-
 src/interface/range.c           |  14 +-
 src/interface/set_options.c     |  52 +++--
 src/interface/x_interface.c     |  52 ++---
 src/ncview.c                    |  51 +++--
 src/ncview.defines.h            |   8 +-
 src/ncview.protos.h             |  10 +-
 src/overlay.c                   |   8 +-
 src/overlay.orig.c              | 441 ---------------------------------------
 src/udu.c                       |  16 +-
 src/utCalendar2_cal.c           |   9 +-
 src/util.c                      |  26 +--
 src/view.c                      |  27 ++-
 26 files changed, 298 insertions(+), 1087 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.git