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

nschloe-guest pushed a commit to branch master
in repository netcdf.

commit 3d5ea5c12cc2215b5bed40a3648e43529bff85a1
Merge: 99f5706 620eaff
Author: Nico Schlömer <nico.schloe...@gmail.com>
Date:   Thu Mar 5 19:16:06 2015 +0100

    Merge branch 'upstream'

 .gitignore                           |   14 +-
 .travis.yml                          |   23 +
 BRANCH-STATUS                        |    5 -
 CMakeLists.txt                       |   65 +-
 CTestConfig.cmake.in                 |    3 +-
 Doxyfile.developer                   |    2 +-
 Makefile.in                          |   47 +-
 README.md                            |    8 +-
 RELEASE_NOTES.md                     |   22 +-
 aclocal.m4                           |  181 +-
 configure => autom4te.cache/output.0 | 4158 ++++++++++++--------------
 configure => autom4te.cache/output.1 | 4158 ++++++++++++--------------
 configure => autom4te.cache/output.2 | 4158 ++++++++++++--------------
 autom4te.cache/requests              |  576 ++++
 autom4te.cache/traces.0              | 3688 +++++++++++++++++++++++
 autom4te.cache/traces.1              | 1676 +++++++++++
 autom4te.cache/traces.2              | 3688 +++++++++++++++++++++++
 cf                                   |    2 +-
 compile                              |    2 +-
 config.guess                         |  201 +-
 config.h.in                          |    7 +-
 config.sub                           |   40 +-
 configure                            | 2026 ++++++-------
 configure.ac                         |    4 +-
 depcomp                              |    2 +-
 docs/Makefile.in                     |   23 +-
 docs/building-with-cmake.md          |  106 -
 docs/footer.html                     |    3 -
 docs/images/Makefile.in              |   22 +-
 docs/netcdf.m4                       |    8 +-
 docs/windows-binaries.md             |   69 +
 examples/C/Makefile.in               |   26 +-
 examples/CDL/Makefile.in             |   25 +-
 examples/Makefile.in                 |   22 +-
 h5_test/Makefile.in                  |   29 +-
 include/Makefile.in                  |   25 +-
 include/nc4internal.h                |    2 +-
 install-sh                           |  366 +--
 libdap2/Makefile.in                  |   26 +-
 libdap2/cdf.c                        |   66 +-
 libdap2/constraints.c                |   57 +-
 libdap2/daputil.c                    |   35 +-
 libdap2/getvara.c                    |  106 +-
 libdap2/nccommon.h                   |    4 +-
 libdap2/ncd2dispatch.c               |   14 +-
 libdap2/ncdap.h                      |    4 +-
 libdispatch/Makefile.in              |   26 +-
 liblib/Makefile.in                   |   26 +-
 libncdap.tar.gz                      |  Bin 316361 -> 0 bytes
 libsrc/Makefile.in                   |   26 +-
 libsrc/attr.c                        |  363 +--
 libsrc/attr.m4                       |   24 +-
 libsrc4/Makefile.in                  |   26 +-
 libsrc4/nc4attr.c                    |    6 +-
 libsrc4/nc4file.c                    |   48 +-
 libsrc4/nc4hdf.c                     |   24 +-
 libsrc4/nc4internal.c                |    4 +-
 libsrc5/Makefile.in                  |   26 +-
 ltmain.sh                            | 5471 +++++++++++++---------------------
 m4/libtool.m4                        | 2381 +++++++--------
 m4/ltoptions.m4                      |  127 +-
 m4/ltsugar.m4                        |    7 +-
 m4/ltversion.m4                      |   12 +-
 m4/lt~obsolete.m4                    |    7 +-
 missing                              |    2 +-
 nc-config.cmake.in                   |    8 +-
 nc_test/CMakeLists.txt               |    2 +-
 nc_test/Makefile.in                  |   29 +-
 nc_test/run_diskless2.sh             |    4 +-
 nc_test4/Makefile.in                 |   29 +-
 nc_test4/run_grp_rename.sh           |   12 +-
 nc_test4/tst_rename.c                |   80 +
 ncdap_test/CMakeLists.txt            |   15 +
 ncdap_test/Makefile.in               |   29 +-
 ncdap_test/expected3/Makefile.in     |   22 +-
 ncdap_test/expected4/Makefile.in     |   22 +-
 ncdap_test/expectremote3/Makefile.in |   22 +-
 ncdap_test/expectremote4/Makefile.in |   22 +-
 ncdap_test/testdata3/Makefile.in     |   22 +-
 ncdap_test/tst_formatx.sh            |    2 +-
 ncdap_test/tst_ncdap3.sh             |    9 +-
 ncdump/CMakeLists.txt                |   83 +-
 ncdump/Makefile.am                   |    7 +-
 ncdump/Makefile.in                   |   70 +-
 ncdump/cdl/Makefile.in               |   22 +-
 ncdump/dumplib.c                     |  130 +-
 ncdump/expected/Makefile.in          |   22 +-
 ncdump/nccopy.1                      |   78 +-
 ncdump/ncdump.1                      |   40 +-
 ncdump/run_back_comp_tests.sh        |    5 +
 ncdump/tst_bug324.c                  |   97 +
 ncdump/tst_formatx3.sh               |    4 +-
 ncdump/tst_formatx4.sh               |    4 +-
 ncdump/tst_lengths.sh                |   75 +-
 ncgen/CMakeLists.txt                 |   15 +
 ncgen/Makefile.in                    |   29 +-
 ncgen/ncgen.1                        |  110 +-
 ncgen3/CMakeLists.txt                |   18 +-
 ncgen3/Makefile.in                   |   29 +-
 ncgen3/main.c                        |    2 +
 ncgen3/ncgen3.1                      |   46 +-
 nctest/Makefile.in                   |   29 +-
 oc2/Makefile.in                      |   23 +-
 oc2/oc.c                             |   42 +-
 oc2/oc.h                             |    2 +-
 oc2/occompile.c                      |   12 +-
 oc2/occurlfunctions.c                |   67 +-
 oc2/ocdata.c                         |   66 +-
 oc2/ocdata.h                         |    2 +-
 oc2/ocdump.c                         |   50 +-
 oc2/ocinternal.c                     |   17 +-
 oc2/ocrc.c                           |   54 +-
 oc2/ocuri.c                          |   19 +-
 oc2/xxdr.c                           |    2 +-
 oc2/xxdr.h                           |    2 +-
 postinstall.sh.in                    |    3 +
 test-driver                          |   15 +-
 117 files changed, 21394 insertions(+), 14626 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/netcdf.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

Reply via email to