[ismrmrd] 101/177: Merge remote-tracking branch 'origin/development' into packaging-cpack

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 26a31670ea059ec8fc425f78bba9ff799b68dc9f
Merge: 3a3898d 7f6139d
Author: Hui Xue <hui.xue at nih.gov>
Date:   Thu Sep 25 16:22:13 2014 -0400

    Merge remote-tracking branch 'origin/development' into packaging-cpack

 include/ismrmrd/dataset.h                    |   7 +-
 include/ismrmrd/ismrmrd.h                    |  27 ++++---
 libsrc/dataset.cpp                           |  35 ++++++++-
 libsrc/ismrmrd.cpp                           | 105 +++++++++++++++++++++++----
 utilities/generate_cartesian_shepp_logan.cpp |  76 +++++++++----------
 utilities/ismrmrd_fftw.h                     |  29 ++++----
 utilities/ismrmrd_ndarray.h                  |  91 -----------------------
 utilities/ismrmrd_phantom.cpp                |  38 +++++-----
 utilities/ismrmrd_phantom.h                  |  16 ++--
 9 files changed, 213 insertions(+), 211 deletions(-)

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