From: Fabian Stemmler <stemmler@in.tum.de>
Date: Mon, 15 Jul 2019 16:19:15 +0000 (+0200)
Subject: Merge branch 'development' of
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=e5ba4628b160a373ed5e7bdcd96ae59b7fbc1faa;hp=e5ba4628b160a373ed5e7bdcd96ae59b7fbc1faa;p=Mograsim.git

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
---