projects
/
Mograsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
47ea68e
)
Merge branch 'development' of
author
Fabian Stemmler
<stemmler@in.tum.de>
Sat, 13 Jul 2019 10:33:03 +0000
(12:33 +0200)
committer
Fabian 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