[gsw] 02/07: Merge tag 'upstream/3.2.0' into debian/master

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository gsw.

commit e20a417b566696cba10671c3cc317514cb6db29f
Merge: 2ffc579 e8890b0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Sep 19 06:58:58 2017 +0100

    Merge tag 'upstream/3.2.0' into debian/master

 MANIFEST.in                              |    2 +
 PKG-INFO                                 |    4 +-
 README.rst                               |    2 +
 gsw/__init__.py                          |    6 +-
 gsw/_version.py                          |   21 +
 gsw/_wrapped_ufuncs.py                   |    2 +-
 gsw/geostrophy.py                        |   81 +-
 gsw/utility.py                           |   64 ++
 setup.cfg                                |    8 +
 setup.py                                 |   35 +-
 src/c_gsw/gsw_oceanographic_toolbox.c    |  625 +++++++++-
 src/c_gsw/gswteos-10.h                   |    8 +
 src/method_bodies.c                      |  150 ++-
 src/method_def_entries.c                 |    4 +
 src2/c_gsw/gsw_oceanographic_toolbox.cpp |  621 +++++++++-
 src2/c_gsw/gswteos-10.h                  |    8 +
 src2/c_gsw/gswteos-10_cpp.h              |    8 +
 src2/method_bodies.c                     |  150 ++-
 src2/method_def_entries.c                |    4 +
 versioneer.py                            | 1822 ++++++++++++++++++++++++++++++
 20 files changed, 3503 insertions(+), 122 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gsw.git