[netcdf] 02/02: Merge branch 'upstream' into split-c-f-cxx

[Nico Schlömer]

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

nschloe-guest pushed a commit to branch split-c-f-cxx
in repository netcdf.

commit 4d2b23d4ca3bc40b37f288fbea0e36062b5db0e5
Merge: c40947b 4dcb673
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Fri Jun 13 10:53:10 2014 +0200

    Merge branch 'upstream' into split-c-f-cxx

 CMakeLists.txt                           |  147 +-
 CTestConfig.cmake                        |   17 +
 Makefile.am                              |    8 +-
 RELEASE_NOTES.md                         |   10 +
 autom4te.cache/output.0                  | 9959 ++++++++++++++++++++++++++++++
 autom4te.cache/requests                  |   77 +
 autom4te.cache/traces.0                  |  939 +++
 cf                                       |   18 +-
 config.h.in.cmake => config.h.cmake.in   |    0
 configure                                | 9959 ++++++++++++++++++++++++++++++
 configure.ac                             |   76 +-
 docs/CMakeLists.txt                      |   27 +-
 docs/Doxyfile.guide.in                   |    2 +-
 docs/Doxyfile.in                         |    2 +-
 docs/Doxyfile.tutorial.in                |    2 +-
 docs/Makefile.am                         |   10 +
 docs/architecture.dox                    |    9 +
 docs/images/netcdf_architecture.png      |  Bin 114366 -> 131864 bytes
 docs/types.dox                           |   22 +-
 examples/C/CMakeLists.txt                |    6 +-
 examples/CDL/CMakeLists.txt              |    5 -
 examples/CMakeLists.txt                  |    4 -
 h5_test/CMakeLists.txt                   |    4 -
 include/CMakeLists.txt                   |    4 -
 include/netcdf.h                         |    4 +-
 libdap2/CMakeLists.txt                   |    6 +-
 libdap2/env                              |    3 +-
 libdap2/getvara.c                        |    3 +-
 libdap2/ncd2dispatch.c                   |    7 +-
 libdispatch/CMakeLists.txt               |    4 -
 liblib/CMakeLists.txt                    |    6 +-
 libnetcdf.settings.in                    |   39 +
 libsrc/CMakeLists.txt                    |    5 -
 libsrc4/CMakeLists.txt                   |    4 -
 libsrc4/nc4file.c                        |   19 +
 libsrc4/nc4hdf.c                         |   34 +-
 libsrc4/nc4var.c                         |   27 +-
 libsrc5/CMakeLists.txt                   |    4 -
 nc-config.in.cmake => nc-config.cmake.in |    0
 nc_test/CMakeLists.txt                   |    4 -
 nc_test4/CMakeLists.txt                  |   11 +-
 nc_test4/Makefile.am                     |    9 +-
 nc_test4/chunked.hdf4                    |  Bin 0 -> 741175 bytes
 nc_test4/contiguous.hdf4                 |  Bin 0 -> 2919 bytes
 nc_test4/run_chunk_hdf4.sh               |   34 +
 nc_test4/tst_chunk_hdf4.c                |   92 +
 ncdap_test/CMakeLists.txt                |    5 -
 ncdap_test/expected3/CMakeLists.txt      |    6 +-
 ncdap_test/expected4/CMakeLists.txt      |    6 +-
 ncdap_test/expectremote3/CMakeLists.txt  |    6 +-
 ncdap_test/expectremote4/CMakeLists.txt  |    6 +-
 ncdap_test/expecttds3/CMakeLists.txt     |    6 +-
 ncdap_test/nocacheremote3/CMakeLists.txt |    6 +-
 ncdap_test/nocacheremote4/CMakeLists.txt |    6 +-
 ncdap_test/special3/CMakeLists.txt       |    6 +-
 ncdap_test/testdata3/CMakeLists.txt      |    4 -
 ncdump/CMakeLists.txt                    |   12 +-
 ncdump/cdl4/CMakeLists.txt               |    6 +-
 ncdump/ctest.c                           | 1333 ----
 ncdump/ctest64.c                         | 1333 ----
 ncdump/expected4/CMakeLists.txt          |    6 +-
 ncgen/CMakeLists.txt                     |    4 -
 ncgen3/CMakeLists.txt                    |    4 -
 nctest/CMakeLists.txt                    |    4 -
 oc2/CMakeLists.txt                       |    6 +-
 oc2/ochttp.c                             |    2 +-
 66 files changed, 21469 insertions(+), 2920 deletions(-)

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