From: rnv <rnv@opencascade.com>
Date: Tue, 30 May 2017 08:35:54 +0000 (+0300)
Subject: Merge branch 'rnv/win_swig_generation' of salome:modules/smesh into rnv/win_swig_gene... 
X-Git-Tag: Before_multi_study_removal_06072017~1^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6ac07fd349b8cf998281f81919138c83e512bd13;p=modules%2Fsmesh.git

Merge branch 'rnv/win_swig_generation' of salome:modules/smesh into rnv/win_swig_generation

Conflicts:
	src/Tools/ZCracksPlug/__init__.py
	src/Tools/padder/spadderpy/gui/inputdialog.py
---

6ac07fd349b8cf998281f81919138c83e512bd13
diff --cc src/Tools/padder/spadderpy/gui/inputdialog.py
index 2ca9f8fc9,a05007792..1ec31ce65
--- a/src/Tools/padder/spadderpy/gui/inputdialog.py
+++ b/src/Tools/padder/spadderpy/gui/inputdialog.py
@@@ -93,7 -93,7 +93,7 @@@ class InputDialog(GenericDialog)
          # indexation.
          self.MESHTYPE_ICONS = {}
          meshTypeIndex = InputData.MESHTYPES.CONCRETE
--        self.__ui.cmbMeshType.setItemText(meshTypeIndex, "Béton")
++        self.__ui.cmbMeshType.setItemText(meshTypeIndex, "B?ton")
          icon = QIcon()
          icon.addFile(os.path.join(iconfolder,"concrete.png"))
          self.__ui.cmbMeshType.setItemIcon(meshTypeIndex, icon)