[nco] 02/06: Merge tag 'upstream/4.6.2'
Bas Couwenberg
sebastic at debian.org
Wed Nov 16 18:36:42 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository nco.
commit f3dc357f24c399ab30c1b36da178c9c8f3c4a5c8
Merge: ac7f707 da99c5c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Nov 16 19:06:13 2016 +0100
Merge tag 'upstream/4.6.2'
Upstream version 4.6.2
Conflicts:
debian/changelog
bld/Makefile | 17 +-
bld/nco.spec | 11 +-
bld/nco_dst.pl | 30 +-
bm/NCO_rgr.pm | 80 +-
config.h.in | 6 +
configure | 41 +-
configure.ac | 9 +-
configure.eg | 6 +-
data/bsc_tst.nco | 2 +-
data/in.cdl | 14 +
data/in_4.cdl | 15 +-
data/in_grp.cdl | 4 +-
data/ncap.in | 2 +-
data/ncclimo | 36 +-
data/ncremap | 47 +-
doc/ANNOUNCE | 164 ++--
doc/ChangeLog | 235 ++++-
doc/MANIFEST | 2 +
doc/README_msvc.txt | 2 +-
doc/TODO | 10 +-
doc/VERSION | 2 +-
doc/debian.txt | 162 ++--
doc/index.shtml | 83 +-
doc/nco.texi | 1236 ++++++++++++++++++++++-----
doc/nco_qt_msvc.shtml | 2 +-
man/ncclimo.1 | 10 +-
man/ncflint.1 | 2 +-
man/ncremap.1 | 8 +-
qt/libnco/libnco.pro | 6 +-
qt/libnco/libnco.vcxproj | 83 +-
qt/libnco/libnco.vcxproj.filters | 295 +++++++
qt/libnco_c++/libnco_c++.vcxproj | 81 +-
qt/libnco_c++/libnco_c++.vcxproj.filters | 64 ++
qt/ncap2/ncap2.vcxproj | 91 +-
qt/ncap2/ncap2.vcxproj.filters | 127 +++
qt/ncatted/ncatted.vcxproj | 91 +-
qt/ncatted/ncatted.vcxproj.filters | 18 +
qt/ncbo/ncbo.vcxproj | 91 +-
qt/ncbo/ncbo.vcxproj.filters | 18 +
qt/ncea/ncea.vcxproj | 91 +-
qt/ncea/ncea.vcxproj.filters | 18 +
qt/ncecat/ncecat.vcxproj | 91 +-
qt/ncecat/ncecat.vcxproj.filters | 18 +
qt/ncflint/ncflint.vcxproj | 91 +-
qt/ncflint/ncflint.vcxproj.filters | 18 +
qt/ncks/ncks.vcxproj | 91 +-
qt/ncks/ncks.vcxproj.filters | 18 +
qt/nco.pri | 4 +
qt/nco.sln | 10 +-
qt/ncpdq/ncpdq.vcxproj | 91 +-
qt/ncpdq/ncpdq.vcxproj.filters | 18 +
qt/ncra/ncra.vcxproj | 91 +-
qt/ncra/ncra.vcxproj.filters | 18 +
qt/ncrcat/ncrcat.vcxproj | 91 +-
qt/ncrcat/ncrcat.vcxproj.filters | 18 +
qt/ncrename/ncrename.vcxproj | 91 +-
qt/ncrename/ncrename.vcxproj.filters | 18 +
qt/ncwa/ncwa.vcxproj | 91 +-
qt/ncwa/ncwa.vcxproj.filters | 18 +
qt/tst_nco_c++/tst_nco_c++.vcxproj | 91 +-
qt/tst_nco_c++/tst_nco_c++.vcxproj.filters | 18 +
src/nco++/fmc_all_cls.cc | 4 +-
src/nco++/fmc_gsl_cls.cc | 2 +-
src/nco++/ncap2_utl.cc | 37 +
src/nco++/ncap2_utl.hh | 4 +
src/nco++/ncoGrammer.g | 195 ++++-
src/nco++/ncoLexer.cpp | 100 ++-
src/nco++/ncoLexer.hpp | 19 +-
src/nco++/ncoParser.cpp | 2 +-
src/nco++/ncoParser.hpp | 2 +-
src/nco++/ncoParserTokenTypes.hpp | 2 +-
src/nco++/ncoTree.cpp | 536 ++++++++----
src/nco++/ncoTree.hpp | 8 +-
src/nco/Makefile.am | 2 +
src/nco/Makefile.in | 43 +-
src/nco/libnco.h | 1 +
src/nco/ncks.c | 40 +-
src/nco/nco.h | 25 +-
src/nco/nco_att_utl.c | 59 +-
src/nco/nco_att_utl.h | 1 +
src/nco/nco_aux.c | 7 +-
src/nco/nco_cnv_csm.c | 2 +-
src/nco/nco_ctl.c | 14 +-
src/nco/nco_dmn_utl.c | 1 +
src/nco/nco_grp_utl.c | 299 +++----
src/nco/nco_lst_utl.c | 7 +-
src/nco/nco_mmr.c | 3 +-
src/nco/nco_msa.c | 87 +-
src/nco/nco_mta.c | 253 ++++++
src/nco/nco_mta.h | 83 ++
src/nco/nco_netcdf.c | 37 +
src/nco/nco_netcdf.h | 8 +-
src/nco/nco_omp.c | 2 +-
src/nco/nco_ppc.c | 66 +-
src/nco/nco_ppc.h | 1 +
src/nco/nco_prn.c | 1281 ++++++++++++++++++++++++++--
src/nco/nco_prn.h | 24 +
src/nco/nco_rgr.c | 287 +++++--
src/nco/nco_rgr.h | 7 +-
src/nco/nco_sld.c | 53 +-
src/nco/nco_sng_utl.c | 200 +++--
src/nco/nco_sng_utl.h | 34 +-
src/nco/nco_var_lst.c | 6 +-
src/nco/nco_var_utl.c | 4 +-
src/nco/ncra.c | 7 +-
src/nco/ncwa.c | 53 +-
106 files changed, 6174 insertions(+), 2041 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/nco.git
More information about the Pkg-grass-devel
mailing list