Merge branch 'V9_4_BR'

author vsr <vsr@opencascade.com>

Fri, 6 Dec 2019 13:44:18 +0000 (16:44 +0300)

committer vsr <vsr@opencascade.com>

Fri, 6 Dec 2019 13:44:27 +0000 (16:44 +0300)
author vsr <vsr@opencascade.com>
Fri, 6 Dec 2019 13:44:18 +0000 (16:44 +0300)
committer vsr <vsr@opencascade.com>
Fri, 6 Dec 2019 13:44:27 +0000 (16:44 +0300)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/GUI/HexoticPluginGUI_HypothesisCreator.h

index c107930f7816560c82394bd9b62b72bbba4b4604,be50efdb4c8821a13183422eeabeadc6a316bfcf..5cf0035ab3e1a17a48d646905ef070005d39f505
--- 1/src/GUI/HexoticPluginGUI_HypothesisCreator.h
--- 2/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
author	vsr <vsr@opencascade.com>
	Fri, 6 Dec 2019 13:44:18 +0000 (16:44 +0300)
committer	vsr <vsr@opencascade.com>
	Fri, 6 Dec 2019 13:44:27 +0000 (16:44 +0300)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/GUI/HexoticPluginGUI_HypothesisCreator.h	patch \|	diff1 \|	diff2 \|	blob \| history