Merge remote-tracking branch 'origin/development' into development
authorDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 25 Sep 2019 09:57:25 +0000 (11:57 +0200)
committerDaniel Kirschten <daniel.kirschten@gmx.de>
Wed, 25 Sep 2019 09:57:25 +0000 (11:57 +0200)
commitf30643a40e01919e4544891bb8bd92fa37a5b5a7
tree347eff505570b1f931dda559bb9f7b17ef30c121
parentea2cf52020e48cbb854410c51d779456e6eca4ae
parent3eb713f4790896fbb3b71028a03b946a3d12dbd0
Merge remote-tracking branch 'origin/development' into development

# Conflicts:
# plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/views/LogicUIPart.java
plugins/net.mograsim.plugin.core/META-INF/MANIFEST.MF
plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/SimulationViewEditor.java