Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

Conflicts:
	src/HYDROGUI/HYDROGUI_Operations.cxx

diff --cc src/HYDROData/CMakeLists.txt
Simple merge

diff --cc src/HYDROGUI/CMakeLists.txt
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index aad39a09737a508645f83936fd16f4f79c8552a9,74eb0a8e108c3c8b1af1713ba420474426dca43a..44d0636e5b2d7d05af3eb21bac5b1b0d02f61507
--- 1/src/HYDROGUI/HYDROGUI_Operations.cxx
--- 2/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@@ -63,7 -62,8 +63,9 @@@
  #include "HYDROGUI_StricklerTableOp.h"
  #include "HYDROGUI_DuplicateOp.h"
  #include "HYDROGUI_LandCoverOp.h"
 +#include "HYDROGUI_ExportSinusXOp.h"
+ #include "HYDROGUI_MergePolylinesOp.h"
+ #include "HYDROGUI_SplitPolylinesOp.h"
  
  #include <HYDROData_Document.h>
  #include <HYDROData_Obstacle.h>

diff --cc src/HYDROGUI/HYDROGUI_Operations.h
Simple merge

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