[med-svn] [ismrmrd] 02/04: Merge tag 'upstream/1.2.3'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit 4309dcd99b8556b0a43ed819d4e30e720d21a45a
Merge: ecd6a52 766b60a
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Mar 10 11:40:31 2015 +0000

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3

 CMakeLists.txt                               |   2 +-
 bindings/python/.gitignore                   |   6 -
 bindings/python/MANIFEST.in                  |   3 -
 bindings/python/Makefile                     |  14 -
 bindings/python/README                       |   1 -
 bindings/python/cismrmrd.pxd                 | 256 --------
 bindings/python/demo.py                      |  11 -
 bindings/python/ismrmrd.pyx                  | 874 ---------------------------
 bindings/python/setup.py                     |  62 --
 cmake/ismrmrd_cpack.cmake                    |   5 +
 doc/source/index.rst                         |   1 +
 examples/c/main.c                            |   2 +
 examples/python/ismrmrd_recon_dataset.py     | 141 +++--
 include/ismrmrd/ismrmrd.h                    |  44 +-
 libsrc/dataset.c                             | 235 ++++---
 libsrc/ismrmrd.c                             |  26 +-
 libsrc/ismrmrd.cpp                           |  96 ++-
 libsrc/xml.cpp                               |   6 +-
 utilities/CMakeLists.txt                     |   2 +-
 utilities/generate_cartesian_shepp_logan.cpp |   6 +-
 20 files changed, 342 insertions(+), 1451 deletions(-)

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