[ismrmrd] 158/177: Merge branch 'development' of ssh://git.code.sf.net/p/ismrmrd/code into development

[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 5275dce38d978fbede0c1c35bb3f3d84ab37b7d9
Merge: f75880a 73d5171
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Oct 23 18:36:39 2014 +0100

    Merge branch 'development' of ssh://git.code.sf.net/p/ismrmrd/code into development

 .gitignore                                   |   1 +
 CMakeLists.txt                               |   3 +-
 bindings/CMakeLists.txt                      |  19 --
 bindings/python/.gitignore                   |   3 +
 bindings/python/CMakeLists.txt               |  44 ---
 bindings/python/Makefile                     |   9 +
 bindings/python/cismrmrd.pxd                 | 195 +++++++++++++
 bindings/python/demo.py                      |  11 +
 bindings/python/ismrmrd.pyx                  | 406 +++++++++++++++++++++++++++
 bindings/python/ismrmrd_python.i             | 353 -----------------------
 bindings/python/setup.py                     |  21 ++
 bindings/python/test.py                      |   9 -
 examples/c/main.c                            |   4 +-
 include/ismrmrd/dataset.h                    |  33 +--
 libsrc/dataset.c                             |  45 +--
 libsrc/dataset.cpp                           |  50 ++--
 matlab/+ismrmrd/+xml/deserialize.m           | 145 ++++++++++
 utilities/generate_cartesian_shepp_logan.cpp |   7 +-
 utilities/recon_cartesian_2d.cpp             |   2 +-
 19 files changed, 837 insertions(+), 523 deletions(-)

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