projects / Mograsim.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 878d036 657f9c9)
Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Mon, 15 Jul 2019 16:19:15 +0000 (18:19 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Mon, 15 Jul 2019 16:19:15 +0000 (18:19 +0200)
commite5ba4628b160a373ed5e7bdcd96ae59b7fbc1faa
treedd6ba405624976a6d35fac2e20b66727e729b3cetree | snapshot
parent878d036669f4aa9d0c332ced43da3a08b94655e9commit | diff
parent657f9c901e20c7b2efe53e0daa4b56c8082854b9commit | diff
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

# Conflicts:
# net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java diff1 | diff2 | blob | history
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java diff1 | diff2 | blob | history
Mirror of https://github.com/Mograsim-Team/Mograsim