[med-svn] [fw4spl] 03/03: Merge tag 'upstream/0.9.2'

[Corentin Desfarges]

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

corentin-guest pushed a commit to branch master
in repository fw4spl.

commit d9dd0b85086ac028e8eb382041bd96d5267193ea
Merge: dfbbd54 6ab62ba
Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
Date:   Mon Nov 17 12:18:48 2014 +0100

    Merge tag 'upstream/0.9.2'
    
    Upstream version 0.9.2

 .../src/tuto02DataServiceBasicCtrl/Plugin.cpp      |   2 +-
 .../{media => LeafUI/monitorQt}/rc/icon-dump.svg   |   0
 .../src/uiGenericQt/action/SShowAbout.cpp          |   2 +-
 .../src/uiGenericQt/action/ShowAcknowledgments.cpp |   2 +-
 .../{media => LeafUI/uiImageQt}/rc/nowindowing.svg |   0
 Bundles/{media => LeafUI/uiImageQt}/rc/ramp.png    | Bin
 .../{media => LeafUI/uiImageQt}/rc/sliceHide.png   | Bin
 .../{media => LeafUI/uiImageQt}/rc/sliceShow.png   | Bin
 Bundles/{media => LeafUI/uiImageQt}/rc/square.png  | Bin
 .../{media => LeafUI/uiImageQt}/rc/windowing.svg   |   0
 .../uiImageQt/src/uiImageQt/ShowScanEditor.cpp     |   4 +-
 .../LeafUI/uiImageQt/src/uiImageQt/WindowLevel.cpp |   8 +-
 .../uiMeasurementQt}/rc/distance.png               | Bin
 .../src/uiMeasurementQt/editor/Distance.cpp        |   2 +-
 .../src/uiMedDataQt/widget/SelectorModel.cpp       |   4 +-
 Bundles/{media => LeafUI/uiTF}/rc/delete.png       | Bin
 Bundles/{media => LeafUI/uiTF}/rc/export.png       | Bin
 Bundles/{media => LeafUI/uiTF}/rc/import.png       | Bin
 Bundles/{media => LeafUI/uiTF}/rc/new.png          | Bin
 Bundles/{media => LeafUI/uiTF}/rc/reinitialize.png | Bin
 Bundles/{media => LeafUI/uiTF}/rc/rename.png       | Bin
 .../uiTF/src/uiTF/TransferFunctionEditor.cpp       |  14 +--
 .../{media => LeafUI/uiVisuQt}/rc/camera-photo.png | Bin
 .../uiVisuQt/src/uiVisuQt/SnapshotEditor.cpp       |   2 +-
 .../visuVTKAdaptor/src/visuVTKAdaptor/Video.cpp    |   2 +-
 Bundles/media/CMakeLists.txt                       |   3 +-
 Bundles/media/Properties.cmake                     |   2 +-
 Bundles/media/src/media/media.cpp                  |   1 -
 CMake/cppunit/cppunit_main.cpp                     |   2 +-
 CMakeLists.txt                                     | 105 ++++++---------------
 .../fwGui/layoutManager/IFrameLayoutManager.cpp    |   4 +-
 .../src/fwGui/layoutManager/IMenuLayoutManager.cpp |   2 +-
 .../fwGui/layoutManager/IToolBarLayoutManager.cpp  |   3 +-
 SrcLib/core/fwGuiQt/CMakeLists.txt                 |   6 +-
 SrcLib/core/fwRuntime/src/dl/Native.cpp            |  11 ++-
 35 files changed, 68 insertions(+), 113 deletions(-)

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