From: Fabian Stemmler <stemmler@in.tum.de>
Date: Wed, 29 May 2019 16:07:52 +0000 (+0200)
Subject: Merge branch 'development' of
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=86f2e11d28a4100a7fe142e103b7b5eeb9de4214;hp=86f2e11d28a4100a7fe142e103b7b5eeb9de4214;p=Mograsim.git

Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

# Conflicts:
#	LogicUI/src/era/mi/gui/LogicUIStandalone.java
---