projects / Mograsim.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cde73b0 bcaa748)
Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Tue, 24 Sep 2019 14:29:34 +0000 (16:29 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Tue, 24 Sep 2019 14:29:34 +0000 (16:29 +0200)
commit4c2b7a2100e55b5e4bf59666b9684d5a996bd0fb
tree22775201f3c1c7e4f6ea4f44a05f4d1c62047238tree | snapshot
parentcde73b0b1eb9660e12400abc970c4c7f3ed9dda5commit | diff
parentbcaa748f1b1522b462822c679d4d8a8bdab16d19commit | diff
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java diff1 | diff2 | blob | history
Mirror of https://github.com/Mograsim-Team/Mograsim