Salome HOME
Merge branch 'rnv/win_swig_generation' of salome:modules/smesh into rnv/win_swig_gene...
authorrnv <rnv@opencascade.com>
Tue, 30 May 2017 08:35:54 +0000 (11:35 +0300)
committerrnv <rnv@opencascade.com>
Tue, 30 May 2017 08:35:54 +0000 (11:35 +0300)
Conflicts:
src/Tools/ZCracksPlug/__init__.py
src/Tools/padder/spadderpy/gui/inputdialog.py

1  2 
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)