[nfft] 14/16: Merge tag 'upstream/3.3.1' into debian/master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository nfft.

commit f0a1fe4e34279ee424d63154fad9e5079106b89d
Merge: 01a33ba 07f7f9d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu May 5 10:15:28 2016 +0100

    Merge tag 'upstream/3.3.1' into debian/master
    
    Upstream version 3.3.1
    
    # gpg: Signature made Thu 05 May 2016 10:15:24 BST using RSA key ID DDEB910A
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 1282 871F 5C7F 0CB6 BBA1  0BD9 A930 D81A 46EC 4F9B
    #      Subkey fingerprint: F3DB 8E75 2506 0E1B DB84  C20D 6A99 0FB3 DDEB 910A

 .gitignore                               |  2 +-
 .travis.yml                              | 71 ++++++++++++++++++++------------
 ChangeLog                                |  9 +++-
 applications/fastsum/fastsum.m           |  7 +++-
 applications/fastsumS2/fastsumS2.m       | 10 +++--
 applications/mri/mri2d/mri.m             | 21 ++++++++--
 applications/mri/mri2d/mri_inh.m         | 21 ++++++++--
 applications/mri/mri3d/mri.m             | 28 +++++++++++--
 applications/polarFFT/fft_test.m         | 21 ++++++++--
 applications/quadratureS2/quadratureS2.m |  8 +++-
 applications/radon/radon.m               | 14 ++++++-
 applications/radon/ridgelet.m            | 14 ++++++-
 configure.ac                             | 16 ++++++-
 examples/nfft/flags.m                    | 11 +++--
 examples/nfft/simple_test_threads.c.in   |  2 +-
 examples/nfft/taylor_nfft.c              |  6 +--
 examples/nfft/taylor_nfft.m              | 13 ++++--
 examples/solver/glacier.m                |  7 +++-
 examples/solver/glacier_cv.m             |  7 +++-
 include/infft.h                          | 12 ++++--
 include/nfft3.h                          |  4 +-
 include/nfft3mp.h                        | 12 ++++--
 kernel/util/Makefile.am                  |  2 +-
 kernel/util/bspline.c                    | 12 ++----
 kernel/util/version.c                    | 26 ++++++++++++
 m4/ax_prog_matlab.m4                     | 14 +++++--
 matlab/Makefile.am                       |  7 +++-
 tests/bspline.c                          |  2 +-
 tests/nfft.c                             |  6 +--
 29 files changed, 290 insertions(+), 95 deletions(-)

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