Salome HOME
Merge remote-tracking branch 'origin/agr/fix_tests'
authorabn <adrien.bruneton@cea.fr>
Wed, 27 Jul 2016 10:10:55 +0000 (12:10 +0200)
committerabn <adrien.bruneton@cea.fr>
Wed, 27 Jul 2016 10:10:55 +0000 (12:10 +0200)
commit2150e7c3c1bfbd9a364d197b5ff016914a294c9b
treeaeecdbbab793854abb7304e45fd7391ca24dd3ac
parent547310b7a6efbbe224df706320345a8b6acf8bc1
parent80657e4615027595184835a4c2f3d5548dc1b18d
Merge remote-tracking branch 'origin/agr/fix_tests'

Conflicts:
src/MEDCalc/gui/CMakeLists.txt
src/MEDCalc/gui/MEDModule.cxx
src/MEDCalc/gui/MEDModule.hxx
CMakeLists.txt
src/MEDCalc/gui/DatasourceController.cxx
src/MEDCalc/gui/MEDModule.cxx
src/MEDCalc/gui/MEDModule.hxx
src/MEDCalc/gui/WorkspaceController.cxx
src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx