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

[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 f5922d7c69110cdb90532523825c691ba7f27a22
Merge: 69c316f 5f29a7f
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date:   Fri Sep 30 09:48:38 2016 +0200

    Merge tag 'upstream/4.0.3'
    
    Upstream version 4.0.3

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                | 598 ---------------------
 imaging/actions/CMakeLists.txt                     |   2 +-
 imaging/actions/itksegmentation/RegionGrowing.h    |   2 +-
 imaging/applications/CMakeLists.txt                |   2 +-
 imaging/components/CMakeLists.txt                  |   2 +-
 imaging/components/dicom/DicomComponent.cpp        |   4 +-
 imaging/components/dicom/DicomComponent.h          |   2 +-
 .../components/dicom/DicomComponentExtension.cpp   |   6 +-
 imaging/components/dicom/DicomComponentExtension.h |   4 +-
 imaging/components/dicom/DicomDialogEntry.h        |  12 +-
 imaging/components/dicom/DicomParser.cpp           |   2 +-
 imaging/components/dicom/DicomParser.h             |  30 +-
 imaging/components/dicom/DicomSerie.h              |  18 +-
 .../dicomtree/DicomTreeDirectoryComponent.h        |   6 +-
 .../dicomtree/DicomTreeSerieComponent.cpp          |   4 +-
 .../components/dicomtree/DicomTreeSerieComponent.h |  14 +-
 .../dicomtree/DicomTreeStudyComponent.cpp          |   3 -
 .../components/dicomtree/DicomTreeStudyComponent.h |  10 +-
 imaging/libraries/CMakeLists.txt                   |   2 +-
 modeling/actions/CMakeLists.txt                    |   2 +-
 modeling/applications/CMakeLists.txt               |   2 +-
 modeling/components/CMakeLists.txt                 |   2 +-
 modeling/libraries/CMakeLists.txt                  |   2 +-
 modeling/libraries/lml/CMakeLists.txt              |   2 +-
 .../libraries/mml/monitoring/AnsysBatchWriter.h    |   2 +-
 modeling/libraries/pml/CMakeLists.txt              |   2 +-
 python_sdk/actions/CMakeLists.txt                  |   2 +-
 python_sdk/applications/CMakeLists.txt             |   2 +-
 python_sdk/components/CMakeLists.txt               |   2 +-
 python_sdk/libraries/CMakeLists.txt                |   2 +-
 sdk/actions/CMakeLists.txt                         |   2 +-
 sdk/actions/application/CloseAction.h              |   2 +-
 sdk/actions/frame/CMakeLists.txt                   |   2 +-
 sdk/actions/frame/editframes/EditFrame.cpp         |   2 +-
 sdk/actions/image/CMakeLists.txt                   |   2 +-
 sdk/actions/image/cropvolume/BoxVOI.h              |   2 +-
 sdk/actions/mesh/CMakeLists.txt                    |   2 +-
 sdk/applications/CMakeLists.txt                    |   2 +-
 .../resources/camitk-actionstatemachine.1.in       |  14 +-
 .../resources/manpage-epilogue.1.in                |   4 +-
 .../resources/manpage-prologue.1.in                |   8 +-
 sdk/applications/cepgenerator/main.cpp             |   2 +-
 .../resources/camitk-cepgenerator.1.in             |   6 +-
 .../cepgenerator/resources/manpage-epilogue.1.in   |   4 +-
 .../cepgenerator/resources/manpage-prologue.1.in   |   2 +-
 .../cepgenerator/testdata/actionAndComponent.xml   |  50 ++
 .../config/resources/camitk-config.1.in            |   6 +-
 .../config/resources/manpage-epilogue.1.in         |   4 +-
 .../config/resources/manpage-prologue.1.in         |   2 +-
 sdk/applications/imp/main.cpp                      |   2 +-
 sdk/applications/imp/resources/camitk-imp.1.in     |   6 +-
 .../imp/resources/manpage-epilogue.1.in            |   4 +-
 .../imp/resources/manpage-prologue.1.in            |   2 +-
 .../wizard/resources/camitk-wizard.1.in            |   6 +-
 .../wizard/resources/manpage-epilogue.1.in         |   4 +-
 .../wizard/resources/manpage-prologue.1.in         |   2 +-
 .../wizard/resources/newbieWizardDescription.html  |   2 +-
 .../modules/macros/camitk/CamiTKApplication.cmake  |  30 +-
 .../modules/macros/camitk/CamiTKExtension.cmake    |  28 +-
 .../macros/camitk/CamiTKExtensionProject.cmake     |  11 +-
 .../modules/macros/camitk/CamiTKLibrary.cmake      |   2 +-
 .../camitk/packaging/CamiTKCEPPackaging.cmake      |   7 +-
 .../packaging/CamiTKOpenSourcePackaging.cmake      |  34 +-
 sdk/components/CMakeLists.txt                      |   2 +-
 sdk/components/off/OffExtension.cpp                |   2 +-
 sdk/libraries/CMakeLists.txt                       |   2 +-
 sdk/libraries/cepgenerator/ActionGenerator.cpp     |  22 +-
 sdk/libraries/cepgenerator/ActionGenerator.h       |   3 +
 sdk/libraries/cepgenerator/resources/Action.cpp.in |   4 +-
 sdk/libraries/cepgenerator/resources/Action.h.in   |  10 +-
 .../cepgenerator/resources/ActionExtension.cpp.in  |   3 -
 .../cepgenerator/resources/ActionExtension.h.in    |   1 +
 .../cepgenerator/resources/Component.cpp.in        |   3 +-
 .../resources/ComponentExtension.cpp.in            |   2 -
 .../cepgenerator/resources/ComponentExtension.h.in |   1 +
 .../resources/actions.CMakeLists.txt.in            |   2 +-
 .../resources/applications.CMakeLists.txt.in       |   2 +-
 .../cepgenerator/resources/cep.CMakeLists.txt.in   |   2 +-
 .../resources/components.CMakeLists.txt.in         |   2 +-
 .../resources/libraries.CMakeLists.txt.in          |   2 +-
 .../libraries/core/CamiTKVersion.h                 |  41 +-
 sdk/libraries/core/utils/ObjectController.h        |   4 +-
 sdk/testapplications/CMakeLists.txt                |   2 +-
 .../testactions/resources/camitk-testactions.1.in  |   6 +-
 .../testactions/resources/manpage-epilogue.1.in    |   4 +-
 .../testactions/resources/manpage-prologue.1.in    |   2 +-
 sdk/testapplications/testcomponents/main.cpp       |   4 +-
 .../resources/camitk-testcomponents.1.in           |   6 +-
 .../testcomponents/resources/manpage-epilogue.1.in |   4 +-
 .../testcomponents/resources/manpage-prologue.1.in |   2 +-
 91 files changed, 296 insertions(+), 849 deletions(-)

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