[ismrmrd] 86/177: Merge

[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 b8ae9f01e5f96adf38cebfb9c40c527caebdbee9
Merge: c0c842a fac5d4d
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Tue Sep 23 21:01:53 2014 -0400

    Merge

 CMakeLists.txt             |    2 +-
 doc/CMakeLists.txt         |   10 +-
 doc/Doxyfile.in            | 2333 ++++++++++++++++++++++++++++++++++++++++++++
 doc/README.md              |  492 ++++++++++
 doc/doxygen/CMakeLists.txt |    8 -
 doc/doxygen/Doxyfile.in    | 1757 ---------------------------------
 include/ismrmrd/dataset.h  |    4 +
 include/ismrmrd/ismrmrd.h  |   95 +-
 include/ismrmrd/meta.h     |   23 +-
 include/ismrmrd/xml.h      |    9 +-
 10 files changed, 2930 insertions(+), 1803 deletions(-)

diff --cc CMakeLists.txt
index 7b6a6c5,be0fd46..150a7e6
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -131,11 -131,11 +131,11 @@@ DESTINATIO
  enable_testing()
  
  # process subdirectories
+ add_subdirectory(doc)
  #add_subdirectory(examples/c++)
  #add_subdirectory(examples/c)
 -#add_subdirectory(utilities)
 +add_subdirectory(utilities)
  #add_subdirectory(tests)
- #add_subdirectory(doc)
  #add_subdirectory(matlab)
  #add_subdirectory(bindings)
 -add_subdirectory(info)
 +add_subdirectory(info)

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