[ismrmrd] 15/16: Merge pull request #4 from ismrmrd/development

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag v1.2.0
in repository ismrmrd.

commit 0b48f46462ab5d6db0bc1a625b809f0bf4607e78
Merge: 33b5c7a 19d87fb
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Fri Dec 19 10:35:53 2014 -0500

    Merge pull request #4 from ismrmrd/development
    
    v1.2.0

 CMakeLists.txt                               |   14 +-
 README.html                                  | 1606 --------------------------
 README.md                                    |   28 +
 bindings/python/Makefile                     |   13 +-
 bindings/python/cismrmrd.pxd                 |   15 +-
 bindings/python/ismrmrd.pyx                  |  112 +-
 doc/CMakeLists.txt                           |   40 +-
 doc/Doxyfile.in                              |   12 +-
 doc/Makefile.sphinx.in                       |  177 +++
 doc/README.md                                |  492 --------
 doc/make.sphinx.bat.in                       |  242 ++++
 doc/{ => source}/TODO.rst                    |    2 +-
 doc/source/conf.py                           |  273 +++++
 doc/{README.rst => source/index.rst}         |  309 ++---
 examples/c/main.c                            |    6 +-
 include/ismrmrd/dataset.h                    |    5 +-
 include/ismrmrd/ismrmrd.h                    |    3 +
 include/ismrmrd/xml.h                        |    6 +
 libsrc/ismrmrd.c                             |   76 +-
 libsrc/xml.cpp                               |   16 +-
 matlab/+ismrmrd/+xml/deserialize.m           |  133 +--
 matlab/+ismrmrd/+xml/serialize.m             |  129 ++-
 schema/ismrmrd.xsd                           |   28 +-
 schema/ismrmrd_example_extended.xml          |  128 ++
 utilities/CMakeLists.txt                     |   11 +-
 utilities/generate_cartesian_shepp_logan.cpp |    1 +
 utilities/ismrmrd_test_xml.cpp               |   55 +
 utilities/recon_cartesian_2d.cpp             |    2 +-
 28 files changed, 1391 insertions(+), 2543 deletions(-)

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