Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Tue, 17 Sep 2019 19:42:21 +0000 (21:42 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Tue, 17 Sep 2019 19:42:21 +0000 (21:42 +0200)
commitd094b43f1697af4586f135790919f866cc53a9a5
tree174a17742a9b58763800283c5f7b02286a6d89a4
parent6c32f347005a369359a68c09b7e9ac2f4a1eab0f
parent1234597eaff5990ecc51d90856786702cc33f52e
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java
plugins/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/machine/Am2900Machine.java