[ismrmrd] 259/281: Merge branch 'development_sf' into hx_development_20140724_vatican

[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 fe61505367c208b0f5ab9620e2ff50af618a5faa
Merge: 36b4044 6111a77
Author: Hui Xue <hui.xue at nih.gov>
Date:   Wed Aug 13 18:03:54 2014 -0400

    Merge branch 'development_sf' into hx_development_20140724_vatican

 CMakeLists.txt                      |     1 +
 cmake/FindIsmrmrd.cmake             |    23 +-
 cmake/FindXSD.cmake                 |     2 +-
 schema/ismrmrd_example_extended.xml |   258 +
 xml/.gitignore                      |     1 +
 xml/CMakeLists.txt                  |    20 +
 xml/ismrmrd_xml.cpp                 |   687 +++
 xml/ismrmrd_xml.h                   |   341 ++
 xml/ismrmrd_xml_export.h            |    14 +
 xml/pugiconfig.hpp                  |    72 +
 xml/pugixml.cpp                     | 10639 ++++++++++++++++++++++++++++++++++
 xml/pugixml.hpp                     |  1332 +++++
 xml/test_ismrmrd_xml.cpp            |    52 +
 13 files changed, 13432 insertions(+), 10 deletions(-)

diff --cc CMakeLists.txt
index 7e8ff89,8b5fec1..75d7056
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -89,3 -123,4 +89,4 @@@ add_subdirectory(tests
  add_subdirectory(doc)
  add_subdirectory(matlab)
  add_subdirectory(bindings)
 -add_subdirectory(xml)
++add_subdirectory(xml)

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