Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Wed, 29 May 2019 10:42:50 +0000 (12:42 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Wed, 29 May 2019 10:42:50 +0000 (12:42 +0200)
commit50082bc2126d3f408acbdf4103bb4fdf29ac1d4f
tree6a1fb6a8b860e019933e13cf2bb058165a24b4a3
parenta37db10f5372ec09624b2ad9b60587e498991cbd
parent9d231e6aa28d5e6526c9f984ca82c1de2a37b559
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019 into development

# Conflicts:
# LogicUI/oldsrc/RSLatchGUIExample.java
# LogicUI/src/era/mi/gui/LogicUIStandalone.java
# LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
# SampleERCP/src/sampleercp/parts/LogicUIPart.java
LogicUI/oldsrc/RSLatchGUIExample.java
LogicUI/src/era/mi/gui/LogicUIStandalone.java
LogicUI/src/era/mi/gui/components/GUIManualSwitch.java