Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

Conflicts:
	src/HYDROGUI/HYDROGUI_Shape.cxx

diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_Shape.cxx
index 60962d74b4c78ad4418c94c0adfa31cfce3f8b1c,c430bb5163bfcc962ed867f22361ca8b43c155b8..6f1f62f9afdace888abe0ae2fb50eacb365b0042
--- 1/src/HYDROGUI/HYDROGUI_Shape.cxx
--- 2/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@@ -486,6 -485,6 +486,7 @@@ Handle_AIS_InteractiveObject HYDROGUI_S
    } else {
      return new AIS_Shape( myTopoShape );
    }
++  }
  }
  
  void HYDROGUI_Shape::buildShape()

diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge