[nco] 02/04: Merge tag 'upstream/4.6.6'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository nco.

commit 43d2eacab5e27ee89c8e2fa1af1bef4f899a6699
Merge: 889178c a5f4165
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 22 11:36:07 2017 +0200

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

 bld/nco.spec                      |   11 +-
 bld/nco_dst.pl                    |   30 +-
 bm/NCO_rgr.pm                     |   25 +-
 configure                         |   25 +-
 configure.ac                      |    7 +-
 configure.eg                      |  169 ++---
 data/buggy.cdl                    |    7 +-
 data/in_grp.cdl                   |    4 +
 data/ncclimo                      |   69 +-
 data/ncremap                      |  206 +++--
 doc/ANNOUNCE                      |  222 +++---
 doc/ChangeLog                     |  190 +++++
 doc/TODO                          |    9 +-
 doc/VERSION                       |    2 +-
 doc/debian.txt                    |  162 ++--
 doc/index.shtml                   |   50 +-
 doc/nco.texi                      |  311 ++++++--
 man/ncclimo.1                     |    5 +-
 man/ncremap.1                     |    7 +-
 src/nco++/NcapVar.hh              |   10 +-
 src/nco++/fmc_all_cls.cc          |  105 ++-
 src/nco++/fmc_all_cls.hh          |    6 +-
 src/nco++/ncap2.cc                |   20 +-
 src/nco++/ncap2_att.cc            |   56 +-
 src/nco++/ncap2_att.hh            |    7 +
 src/nco++/ncoEnumTokenTypes.hpp   |    2 +-
 src/nco++/ncoLexer.cpp            |    2 +-
 src/nco++/ncoLexer.hpp            |    2 +-
 src/nco++/ncoParser.cpp           |    2 +-
 src/nco++/ncoParser.hpp           |    2 +-
 src/nco++/ncoParserTokenTypes.hpp |    2 +-
 src/nco++/ncoTree.cpp             |    2 +-
 src/nco++/ncoTree.hpp             |    2 +-
 src/nco++/prs_cls.hh              |    5 +-
 src/nco/ncks.c                    |   30 +-
 src/nco/nco.h                     |   21 +-
 src/nco/nco_att_utl.c             |   16 +-
 src/nco/nco_cnv_csm.c             |    2 +-
 src/nco/nco_ctl.c                 |    2 +-
 src/nco/nco_fl_utl.c              |   62 +-
 src/nco/nco_grp_utl.c             |   81 +-
 src/nco/nco_grp_utl.h             |    4 +
 src/nco/nco_mmr.c                 |    2 +-
 src/nco/nco_msa.c                 |  124 +++-
 src/nco/nco_omp.c                 |   14 +-
 src/nco/nco_ppc.c                 |    4 +-
 src/nco/nco_prn.c                 |  194 ++---
 src/nco/nco_rgr.c                 | 1488 ++++++++++++++++++++++++++++++++-----
 src/nco/nco_scm.c                 |   21 +-
 src/nco/nco_var_lst.c             |    2 +-
 src/nco/nco_var_utl.c             |  115 ++-
 src/nco/nco_var_utl.h             |   15 +-
 src/nco/ncra.c                    |  111 ++-
 53 files changed, 3116 insertions(+), 928 deletions(-)

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