[med-svn] [camitk] 02/03: Merge tag 'upstream/4.0.4'

[Emmanuel Promayon]

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

promayon-guest pushed a commit to branch master
in repository camitk.

commit 05b5d21c7fe2cd467d3537f67bf08778f2377629
Merge: 9413409 a791f2c
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Fri Dec 2 06:01:15 2016 +0000

    Merge tag 'upstream/4.0.4'
    
    Upstream version 4.0.4

 CMakeLists.txt                                     |    4 +-
 CMakeLists.txt => CMakeLists.txt.orig              |   27 +-
 CMakeLists.txt.user                                |  598 +++++++++++
 .../dicom/DicomComponentExtension.cpp.orig         |  127 +++
 .../dicomtree/DicomTreeStudyComponent.cpp.orig     |   79 ++
 qgit_script.sh                                     |    4 +
 .../reconstruction/ImageReconstructionAction.cpp   |   58 +-
 .../reconstruction/ImageReconstructionAction.h     |    2 +-
 sdk/actions/image/reorientimage/ReorientImage.cpp  |    2 +
 sdk/cmake/modules/#CamiTKConfig.cmake.in#          |  291 ++++++
 .../macros/camitk/CamiTKExtension.cmake.orig       | 1033 ++++++++++++++++++++
 sdk/libraries/core/CamiTKVersion.h                 |    2 +-
 .../qtpropertybrowser/examples/demo/demo.pro.user  |  267 +++++
 13 files changed, 2459 insertions(+), 35 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camitk.git