projects / Mograsim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 8b3e82a)
Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Sat, 13 Jul 2019 10:33:03 +0000 (12:33 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Sat, 13 Jul 2019 10:33:03 +0000 (12:33 +0200)
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/DeserializedSubmodelComponent.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/IndirectGUIComponentCreator.java


No differences found
Mirror of https://github.com/Mograsim-Team/Mograsim