Commit 4533d4eb 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 70cc828b 3fda084f
Pipeline #571995 passed with stage
in 1 minute and 36 seconds