Merge branch 'develop' into wip-isildur-g-cppcheck66

diff --cc src/nfagraph/ng_som.cpp
Simple merge

diff --cc src/nfagraph/ng_violet.cpp
index b3d91e54501867e4dbd6f1a6bb3d5ef7d2a8f277,14bdf73f75d84b983c7872b26fb8dba6b509c2a1..86cdf5ae9cdc3027bab5ccc728bfa56bfe40f283
--- 1/src/nfagraph/ng_violet.cpp
--- 2/src/nfagraph/ng_violet.cpp
+++ b/src/nfagraph/ng_violet.cpp
@@@ -1791,9 -1791,9 +1791,9 @@@ void removeRedundantLiteralsFromInfixes
      }
  
      for (const auto &m : infixes) {
-         NGHolder *h = m.first;
+         const NGHolder *h = m.first;
 -        const auto &edges = m.second;
 -        removeRedundantLiteralsFromInfix(*h, g, edges, cc);
 +        const auto &medges = m.second;
 +        removeRedundantLiteralsFromInfix(*h, g, medges, cc);
      }
  }
  

diff --cc src/rose/rose_build_anchored.cpp
Simple merge

diff --cc src/rose/rose_build_merge.cpp
Simple merge