This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nco.
commit 6dfecdc9c4f8d9f46accd76fbc91b64928e590b6 Merge: ad58536 1cb3c57 Author: Bas Couwenberg <[email protected]> Date: Fri May 26 22:39:36 2017 +0200 Merge tag 'upstream/4.6.7' Upstream version 4.6.7 Conflicts: debian/changelog CMakeLists.txt | 262 +++++++++---- bld/nco.spec | 11 +- bld/nco_dst.pl | 30 +- bm/NCO_rgr.pm | 11 + configure | 21 +- configure.ac | 3 +- configure.eg | 30 +- data/buggy.cdl | 18 + data/clc.cdl | 56 +++ data/in.cdl | 4 + data/ncclimo | 16 +- data/ncremap | 668 +++++++++++++++++++++++++------- data/nsm.cdl | 55 +++ data/trj.cdl | 29 ++ doc/ANNOUNCE | 241 ++++++------ doc/ChangeLog | 227 +++++++++++ doc/VERSION | 2 +- doc/debian.txt | 162 ++++---- doc/index.shtml | 66 ++-- doc/nco.texi | 897 +++++++++++++++++++++++++++++++++++-------- doc/nco_qt_msvc.shtml | 2 +- man/ncap.1 | 2 +- man/ncap2.1 | 2 +- man/ncbo.1 | 2 +- man/ncecat.1 | 2 +- man/nces.1 | 2 +- man/ncflint.1 | 2 +- man/ncpdq.1 | 2 +- man/ncra.1 | 2 +- man/ncrcat.1 | 2 +- man/ncremap.1 | 21 +- man/ncwa.1 | 2 +- qt/nco.pri | 1 + src/nco++/fmc_all_cls.cc | 624 +++++++++++++++++++++++++++++- src/nco++/fmc_all_cls.hh | 11 +- src/nco++/prs_cls.cc | 266 +++++++++---- src/nco++/prs_cls.hh | 8 +- src/nco/ncks.c | 11 +- src/nco/nco.h | 14 +- src/nco/nco_att_utl.c | 48 ++- src/nco/nco_cnk.c | 1 + src/nco/nco_cnv_csm.c | 4 +- src/nco/nco_ctl.c | 30 +- src/nco/nco_fl_utl.c | 2 +- src/nco/nco_grp_utl.c | 9 +- src/nco/nco_mss_val.c | 6 +- src/nco/nco_mta.c | 139 ++++++- src/nco/nco_mta.h | 8 +- src/nco/nco_netcdf.c | 4 +- src/nco/nco_prn.c | 34 +- src/nco/nco_rgr.c | 975 +++++++++++++++++++++++++++++++++++------------ src/nco/nco_var_utl.c | 21 +- 52 files changed, 3987 insertions(+), 1081 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
