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

[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 b1da77580c82bbef05810e869f9e515e3b41940c
Merge: 128d345 0e20bce
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Wed Sep 21 16:25:34 2016 +0200

    Merge tag 'upstream/4.0.2'
    
    Upstream version 4.0.2

 CMakeLists.txt                                     |    2 +-
 CMakeLists.txt.user                                |   77 +-
 modeling/components/pmlcomponent/PMLComponent.cpp  |    4 +-
 sdk/actions/application/AboutAction.cpp            |    2 +-
 sdk/actions/image/cropvolume/CMakeLists.txt        |    2 +-
 sdk/actions/image/reorientimage/CMakeLists.txt     |    2 +-
 sdk/actions/mesh/basicmesh/RigidTransform.cpp      |    2 +-
 sdk/actions/mesh/meshprocessing/CMakeLists.txt     |    2 +-
 .../actionstatemachine/ActionStateMachine.cpp      |    1 -
 sdk/applications/imp/ImpMainWindow.cpp             |    1 +
 .../wizard/resources/camitk-wizard.xpm             | 4143 ++++++++++++++++++++
 sdk/cmake/modules/doxygen.conf.in                  |    6 +-
 .../modules/macros/camitk/CamiTKExtension.cmake    |    8 +-
 ...KExtension.cmake => CamiTKExtension.cmake.orig} |   22 +-
 sdk/components/vtkmesh/VtkMeshComponentExtension.h |    2 +-
 sdk/doc/mainpage.h                                 |    2 +-
 sdk/doc/resources/camitk_service_layer.odg         |  Bin 0 -> 291291 bytes
 sdk/doc/resources/camitk_service_layer_1.png       |  Bin 43233 -> 112253 bytes
 sdk/libraries/core/CamiTKVersion.h                 |   35 -
 sdk/libraries/core/action/Action.h                 |    1 -
 sdk/libraries/core/viewer/.directory               |    4 -
 sdk/libraries/core/viewer/InteractiveViewer.cpp    |    2 +-
 sdk/libraries/core/viewer/MedicalImageViewer.cpp   |    2 +-
 sdk/libraries/core/viewer/PropertyExplorer.cpp     |    1 +
 sdk/libraries/core/viewer/PropertyExplorer.h       |    1 -
 sdk/libraries/core/viewer/RendererWidget.cpp       |   70 +-
 sdk/libraries/core/viewer/RendererWidget.h         |   12 +-
 sdk/testapplications/testactions/main.cpp          |    2 +-
 28 files changed, 4289 insertions(+), 119 deletions(-)

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