From: vsr Date: Fri, 6 Dec 2019 13:44:18 +0000 (+0300) Subject: Merge branch 'V9_4_BR' X-Git-Tag: V9_5_0a1^0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=79c972ee20ff060741c2ed7e7b4a82f9ca78f4bc;p=plugins%2Fhexoticplugin.git Merge branch 'V9_4_BR' --- 79c972ee20ff060741c2ed7e7b4a82f9ca78f4bc diff --cc src/GUI/HexoticPluginGUI_HypothesisCreator.h index c107930,be50efd..5cf0035 --- a/src/GUI/HexoticPluginGUI_HypothesisCreator.h +++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.h @@@ -124,7 -124,7 +124,6 @@@ protected slots void onTabChanged(int); void onAddOption(); void onDirBtnClicked(); - - }; class SizeMapsTableWidgetDelegate : public QItemDelegate