Commit 56b88f2e authored by Jean Meurice's avatar Jean Meurice
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/basic-simulator into sim_dev
parents 571fbcbd 52a67e9f
Pipeline #495158 passed with stage
in 1 minute and 3 seconds