This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository nco.
commit 291456189a3dee1345d670f6a3e2f046240ba9a7 Merge: 362e7c4 6d71641 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jun 13 14:10:36 2015 +0200 Merge tag 'upstream/4.5.0' Upstream version 4.5.0 Conflicts: debian/changelog .travis.yml | 14 + bld/nco.spec | 2 +- bm/NCO_rgr.pm | 193 ++---- bm/nco_bm.pl | 2 +- config.h.in | 3 + configure | 28 +- configure.ac | 13 +- configure.eg | 2 +- data/in.cdl | 11 +- doc/ANNOUNCE | 149 ++-- doc/ChangeLog | 250 ++++++- doc/MANIFEST | 3 + doc/index.shtml | 63 +- doc/nco.texi | 644 ++++++++++++++++-- man/ncks.1 | 10 +- man/ncra.1 | 2 + src/nco++/ncap2.cc | 4 +- src/nco/mpncbo.c | 1 + src/nco/mpncecat.c | 1 + src/nco/mpncflint.c | 3 + src/nco/mpncpdq.c | 1 + src/nco/mpncra.c | 1 + src/nco/mpncwa.c | 1 + src/nco/ncap.c | 2 + src/nco/ncbo.c | 3 +- src/nco/ncecat.c | 12 +- src/nco/ncflint.c | 21 +- src/nco/ncks.c | 185 +++-- src/nco/nco.h | 31 +- src/nco/nco_att_utl.c | 238 ++++++- src/nco/nco_att_utl.h | 17 + src/nco/nco_aux.c | 36 +- src/nco/nco_aux.h | 7 +- src/nco/nco_cnk.c | 8 +- src/nco/nco_cnk.h | 2 +- src/nco/nco_cnv_csm.c | 2 +- src/nco/nco_ctl.c | 28 +- src/nco/nco_grp_trv.c | 45 +- src/nco/nco_grp_trv.h | 10 +- src/nco/nco_grp_utl.c | 52 +- src/nco/nco_grp_utl.h | 2 +- src/nco/nco_msa.c | 3 +- src/nco/nco_mss_val.c | 66 ++ src/nco/nco_mss_val.h | 6 + src/nco/nco_netcdf.c | 33 +- src/nco/nco_netcdf.h | 4 + src/nco/nco_omp.c | 34 +- src/nco/nco_ppc.c | 408 ++++++++++- src/nco/nco_ppc.h | 29 + src/nco/nco_prn.c | 7 + src/nco/nco_rgr.c | 1793 +++++++++++++++++++++++++++++++++++++++++++------ src/nco/nco_rgr.h | 58 +- src/nco/nco_rth_utl.c | 2 +- src/nco/nco_sld.c | 2 +- src/nco/nco_sng_utl.c | 27 +- src/nco/nco_sng_utl.h | 10 +- src/nco/nco_var_avg.c | 4 +- src/nco/nco_var_lst.c | 71 +- src/nco/nco_var_rth.c | 370 ---------- src/nco/nco_var_rth.h | 18 - src/nco/nco_var_utl.c | 139 ++-- src/nco/nco_var_utl.h | 3 +- src/nco/ncpdq.c | 11 +- src/nco/ncra.c | 24 +- src/nco/ncwa.c | 23 +- 65 files changed, 3919 insertions(+), 1328 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel