Gilles DAVID e8173b4ff1 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

2017-04-18 15:57:30 +02:00

..

salome

Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev

2017-04-18 15:57:30 +02:00

CMakeLists.txt

Copyright update: 2016

2016-03-18 20:10:28 +03:00