[ismrmrd] 273/281: Merge remote-tracking branch 'origin/development' into dev_xml_reorg

[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 698dadca6cbe0fe0ae6d98a89d882f7efe1335bc
Merge: 522f681 d49b948
Author: Michael S. Hansen <michael.hansen at nih.gov>
Date:   Fri Aug 29 15:11:55 2014 -0400

    Merge remote-tracking branch 'origin/development' into dev_xml_reorg

 CMakeLists.txt     | 5 ++++-
 xml/ismrmrd_meta.h | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)


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