[netcdf] 01/01: 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 106649f0b03cb51b9a7fc6ca958eee2685228421
Merge: 5133877 1339ba2
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Thu May 22 01:03:39 2014 +0200

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

 CMakeLists.txt                                |   46 +-
 Doxyfile                                      |    2 +-
 Makefile.am                                   |    6 +-
 RELEASE_NOTES.md                              |    4 +
 autom4te.cache/output.0                       | 9959 -------------------------
 autom4te.cache/requests                       |   77 -
 autom4te.cache/traces.0                       |  939 ---
 configure                                     | 9959 -------------------------
 configure.ac                                  |   10 +-
 docs/CMakeLists.txt                           |   76 +
 {man4 => docs}/Doxyfile.guide.in              |   34 +-
 {man4 => docs}/Doxyfile.in                    |   58 +-
 {man4 => docs}/Doxyfile.tutorial.in           |   34 +-
 {man4 => docs}/DoxygenLayout.xml              |    0
 {man4 => docs}/Makefile.am                    |    8 +-
 {man4 => docs}/all-error-codes.md             |    0
 {man4 => docs}/architecture.dox               |    0
 {man4 => docs}/building-with-cmake.md         |    0
 {man4 => docs}/cdl.dox                        |    2 +-
 {man4 => docs}/cmake_faq.md                   |    2 +-
 {man4 => docs}/dispatch.dox                   |    0
 {man4 => docs}/errors.dox.old                 |    2 +-
 {man4 => docs}/esg.html                       |    2 +-
 {man4 => docs}/footer.html                    |    0
 {man4 => docs}/groups.dox                     |    0
 {man4 => docs}/guide.dox                      |    0
 {man4 => docs}/header.html                    |    0
 {man4 => docs}/images/InstallTreeWindows.jpg  |  Bin
 {man4 => docs}/images/InstallTreeWindows.png  |  Bin
 {man4 => docs}/images/Makefile.am             |    0
 {man4 => docs}/images/aqua.jpg                |  Bin
 {man4 => docs}/images/chunking2.png           |  Bin
 {man4 => docs}/images/compatibility3.png      |  Bin
 {man4 => docs}/images/compression.png         |  Bin
 {man4 => docs}/images/deptree.jpg             |  Bin
 {man4 => docs}/images/groups.png              |  Bin
 {man4 => docs}/images/nc-classic-uml.png      |  Bin
 {man4 => docs}/images/nc4-model.png           |  Bin
 {man4 => docs}/images/ncatts.png              |  Bin
 {man4 => docs}/images/nccoords.png            |  Bin
 {man4 => docs}/images/ncfile.png              |  Bin
 {man4 => docs}/images/netcdf_architecture.odg |  Bin
 {man4 => docs}/images/netcdf_architecture.png |  Bin
 {man4 => docs}/images/pnetcdf.png             |  Bin
 {man4 => docs}/images/terra.jpg               |  Bin
 {man4 => docs}/install-fortran.md             |    0
 {man4 => docs}/install.dox                    |    0
 {man4 => docs}/install.md                     |    0
 {man4 => docs}/internal.dox                   |    0
 {man4 => docs}/mainpage.dox                   |    0
 {man4 => docs}/netcdf-50x50.png               |  Bin
 {man4 => docs}/netcdf.m4                      |    0
 {man4 => docs}/notes.dox                      |    0
 {man4 => docs}/old/defines.texi               |    0
 {man4 => docs}/old/netcdf-c.texi              |    0
 {man4 => docs}/old/netcdf-cxx.texi            |    0
 {man4 => docs}/old/netcdf-cxx4.texi           |    0
 {man4 => docs}/old/netcdf-f77.texi            |    0
 {man4 => docs}/old/netcdf-f90.texi            |    0
 {man4 => docs}/old/netcdf-install.texi        |    0
 {man4 => docs}/old/netcdf-internal.texi       |    0
 {man4 => docs}/old/netcdf-tutorial.texi       |    0
 {man4 => docs}/old/netcdf.texi                |    0
 {man4 => docs}/tutorial.dox                   |    0
 {man4 => docs}/types.dox                      |    0
 {man4 => docs}/unidata_logo_cmyk.png          |  Bin
 {man4 => docs}/windows-binaries.md            |    0
 libsrc/CMakeLists.txt                         |    2 +-
 libsrc/Makefile.am                            |    2 +-
 man4/CMakeLists.txt                           |   70 -
 70 files changed, 185 insertions(+), 21109 deletions(-)

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