[ismrmrd] 187/281: Merge branch 'development' into development_merge_hx

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to annotated tag ismrmrd0.5
in repository ismrmrd.

commit bb0348cae3852863388c55172e7e27137c713ee1
Merge: 1c1dd3e 933ab5d
Author: xueh2 <hui.xue at nih.gov>
Date:   Wed Nov 20 18:09:04 2013 -0500

    Merge branch 'development' into development_merge_hx

 CMakeLists.txt                                   |   5 +-
 bindings/java/CMakeLists.txt                     |   9 +-
 bindings/java/XMLString.java                     |  32 +++-
 bindings/python/CMakeLists.txt                   |  22 ++-
 cmake/FindJava.cmake                             | 212 +++++++++++++++++++++++
 examples/java/ismrmrd_test.java                  |  55 +++---
 ismrmrd.h                                        |   2 +-
 ismrmrd_hdf5_datatypes.h                         |   4 +
 matlab/+ismrmrd/{old => }/Acquisition.m          |  26 +--
 matlab/+ismrmrd/AcquisitionHeader.m              |  85 +++++----
 matlab/+ismrmrd/FlagBit.m                        |   4 +-
 matlab/+ismrmrd/{old => }/Image.m                |  18 +-
 matlab/+ismrmrd/{old/file.m => IsmrmrdDataset.m} | 126 ++++++++------
 matlab/+ismrmrd/XMLHeader.m                      |  33 ----
 matlab/+ismrmrd/example.m                        |  41 +++++
 matlab/+ismrmrd/{old => }/hdf5_datatypes.m       | 175 +++++++++++--------
 matlab/+ismrmrd/includejar.m                     |  15 ++
 matlab/+ismrmrd/{old => }/isInt.m                |   0
 matlab/CMakeLists.txt                            |  72 ++++++++
 matlab/XMLString.java                            |  42 +++++
 matlab/cfg.jxb                                   |  10 ++
 21 files changed, 722 insertions(+), 266 deletions(-)


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