[ncview] 17/31: Merge tag 'upstream/2.1.4'

[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 7a2d3a06e8b34fb2e1730a4afa1c08331d96385d
Merge: 8f8d30c ceb875e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 18 01:40:42 2015 +0200

    Merge tag 'upstream/2.1.4'
    
    Upstream version 2.1.4

 src/interface/display_info.c | 2 +-
 src/interface/plot_xy.c      | 2 +-
 src/ncview.c                 | 8 ++++----
 src/ncview.defines.h         | 4 ++--
 src/utCalendar2_cal.c        | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

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