Merge branch 'master' of https://framagit.org/simgrid/simgrid

diff --cc src/mc/api/State.cpp
Simple merge

diff --cc src/mc/api/State.hpp
Simple merge

diff --cc src/mc/explo/DFSExplorer.cpp
Simple merge

diff --cc src/mc/transition/TransitionSynchro.cpp
index 21ea4ec,5e7ded2..bd57886
--- 1/src/mc/transition/TransitionSynchro.cpp
--- 2/src/mc/transition/TransitionSynchro.cpp
+++ b/src/mc/transition/TransitionSynchro.cpp
@@@ -128,7 -128,7 +128,11 @@@ bool SemaphoreTransition::depends(cons
    // Actions executed by the same actor are always dependent
    if (o->aid_ == aid_)
      return true;
++<<<<<<< HEAD
 +  
++=======
+ 
++>>>>>>> dfafe652e9ae62c35cd0fc084b117fc987b3e8dc
    if (const auto* other = dynamic_cast<const SemaphoreTransition*>(o)) {
      if (sem_ != other->sem_)
        return false;