Merge branch 'V9_4_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bacf674eeb4cdaa7f47fc061a8b148c25c2c3b9f..54b40b2ead42d1448d36fe48a576158779f88991 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/src/GUI/HexoticPluginGUI_HypothesisCreator.h b/src/GUI/HexoticPluginGUI_HypothesisCreator.h
index c107930f7816560c82394bd9b62b72bbba4b4604..5cf0035ab3e1a17a48d646905ef070005d39f505 100644 (file)
--- a/src/GUI/HexoticPluginGUI_HypothesisCreator.h
+++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.h
@@ -124,7 +124,6 @@ protected slots:
   void             onTabChanged(int);
   void             onAddOption();
   void             onDirBtnClicked();
-  
 };
 
 class SizeMapsTableWidgetDelegate : public QItemDelegate