[ismrmrd] 124/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 e2ab52481ce2fc91aee875f532b2dcc05c4321d0
Merge: d0f8077 52e2e1a
Author: Hui Xue <hui.xue at nih.gov>
Date:   Wed Oct 1 11:17:18 2014 -0400

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

 cmake/FindIsmrmrd.cmake          |   4 +-
 include/ismrmrd/dataset.h        |   4 +-
 include/ismrmrd/ismrmrd.h        | 182 +++++++--
 info/ismrmrd_info.cpp            |   2 +-
 info/ismrmrd_version.in          |   3 +-
 libsrc/dataset.c                 |   8 +-
 libsrc/dataset.cpp               |  49 ++-
 libsrc/ismrmrd.cpp               | 850 ++++++++++++++++++++++++++++++---------
 libsrc/meta.cpp                  |   6 +-
 libsrc/xml.cpp                   |   4 +
 utilities/recon_cartesian_2d.cpp |  23 +-
 11 files changed, 854 insertions(+), 281 deletions(-)

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