projects / Mograsim.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c7eead cc6e329)
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)
commit6e1902e006401ddea190178595bf6ae6357e74ad
treeafd7f7f27ae7532a98455d8bb91c56966bafb3f2tree | snapshot
parent6c7eead36da313484040d536c78a84a97d60e934commit | diff
parentcc6e329dc014542eb743833ef865b9d59047abbbcommit | 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