Salome HOME
Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev
authorGilles DAVID <gilles-g.david@edf.fr>
Tue, 18 Apr 2017 13:43:53 +0000 (15:43 +0200)
committerGilles DAVID <gilles-g.david@edf.fr>
Tue, 18 Apr 2017 13:57:30 +0000 (15:57 +0200)
commite8173b4ff130ddb26d165c92403ef847fdfb8be2
tree0bcc7d7bd7f2f933cc0489a376382b8e90366248
parent1fe8f961164b5356aaabf85e2bc03257d3c494ea
parent3ac75b123496cc606f086fc9b6aeb89d3c03c732
Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev

Conflicts:
src/Tools/ZCracksPlug/casTests/launchCas.py
src/Tools/padder/spadderpy/gui/inputdialog.py
src/Tools/padder/spadderpy/gui/plugindialog.py
src/Tools/padder/unittests/usecase_meshJobManager.py
src/Tools/ZCracksPlug/__init__.py
src/Tools/ZCracksPlug/casTests/launchCas.py
src/Tools/ZCracksPlug/main.py
src/Tools/ZCracksPlug/utilityFunctions.py
src/Tools/padder/spadderpy/gui/inputdialog.py
src/Tools/padder/spadderpy/gui/plugindialog.py
src/Tools/padder/unittests/usecase_meshJobManager.py