[ncview] 03/06: Merge tag 'upstream/2.1.6+ds'

[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 32aa506b50d8d95354278a782e700bf65c9fe37a
Merge: ea38e28 720a8b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 31 10:16:08 2015 +0100

    Merge tag 'upstream/2.1.6+ds'
    
    Upstream version 2.1.6+ds

 src/calcalcs.c        | 12 ++++++++----
 src/calcalcs.h        |  4 ++--
 src/file_netcdf.c     | 19 ++++++++++++++++---
 src/ncview.c          |  5 +++++
 src/ncview.defines.h  |  5 +++--
 src/udu.c             |  5 +++++
 src/utCalendar2_cal.c | 36 ++++++++++++++++++++++++++++--------
 src/view.c            |  4 ++++
 8 files changed, 71 insertions(+), 19 deletions(-)

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