[nco] 02/05: Merge tag 'upstream/4.5.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository nco.

commit 8a6a2129ed5ff5f9304f30d0feaa20df7250273a
Merge: 0d79837 bf81361
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 14 08:56:42 2015 +0200

    Merge tag 'upstream/4.5.1'
    
    Upstream version 4.5.1
    
    Conflicts:
    	debian/changelog

 .travis.yml              |    8 +-
 Makefile.in              |   59 ++-
 aclocal.m4               |   71 +--
 bld/Makefile             |    8 +-
 bld/nco.spec             |   14 +-
 bld/nco_dst.pl           |   26 +-
 bm/NCO_bm.pm             |  115 +++--
 bm/NCO_rgr.pm            |  347 ++++++++++-----
 bm/nco_bm.pl             |  268 +++++------
 configure                |   78 ++--
 configure.ac             |   47 +-
 configure.eg             |   13 +-
 data/Makefile.in         |   24 +-
 data/in.cdl              |    2 +-
 data/in_grp_3.cdl        |    6 +-
 data/ncap2.in            |    5 +-
 doc/ANNOUNCE             |  121 ++---
 doc/ChangeLog            |  190 ++++++++
 doc/MANIFEST             |    1 +
 doc/Makefile.in          |   28 +-
 doc/TODO                 |    4 +-
 doc/VERSION              |    2 +-
 doc/debian.txt           |  166 ++++---
 doc/index.shtml          |  105 +++--
 doc/nco.texi             |  162 ++++---
 man/Makefile.in          |   24 +-
 man/ncatted.1            |   12 +-
 man/ncks.1               |    2 +-
 src/Makefile.in          |   24 +-
 src/nco++/Makefile.in    |   25 +-
 src/nco++/Makefile.old   |   11 +-
 src/nco++/fmc_all_cls.cc |   17 +-
 src/nco++/fmc_all_cls.hh |    2 +-
 src/nco++/ncap2.cc       |   79 ++--
 src/nco++/ncap2_utl.cc   |  864 +++++++++++++++--------------------
 src/nco++/prs_cls.cc     |   36 +-
 src/nco/Makefile.in      |   30 +-
 src/nco/ncatted.c        |   20 +-
 src/nco/ncecat.c         |    2 -
 src/nco/ncks.c           |   21 +-
 src/nco/nco.h            |   12 +-
 src/nco/nco_att_utl.c    |  347 ++++++++++++++-
 src/nco/nco_att_utl.h    |   40 +-
 src/nco/nco_cnk.c        |    1 +
 src/nco/nco_cnv_csm.c    |   58 ++-
 src/nco/nco_ctl.c        |   37 +-
 src/nco/nco_ctl.h        |    3 +
 src/nco/nco_grp_trv.c    |    4 +-
 src/nco/nco_grp_utl.c    |  686 ++++++----------------------
 src/nco/nco_grp_utl.h    |   40 --
 src/nco/nco_msa.c        |  135 +++---
 src/nco/nco_mss_val.c    |    7 +-
 src/nco/nco_netcdf.c     |    8 +-
 src/nco/nco_netcdf.h     |    4 +-
 src/nco/nco_omp.c        |   32 +-
 src/nco/nco_ppc.c        |    3 +-
 src/nco/nco_prn.c        |    6 -
 src/nco/nco_rgr.c        | 1111 ++++++++++++++++------------------------------
 src/nco/nco_rgr.h        |   71 +--
 src/nco/nco_sld.c        |  594 ++++++++++++++++++++++++-
 src/nco/nco_sld.h        |   49 ++
 src/nco/nco_typ.h        |    2 +-
 src/nco/nco_var_avg.c    |    7 +-
 src/nco/nco_var_utl.c    |    4 +-
 src/nco/ncra.c           |   85 ++--
 src/nco/ncwa.c           |    2 +-
 src/nco_c++/Makefile.in  |   32 +-
 67 files changed, 3489 insertions(+), 2930 deletions(-)

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