Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Tue, 27 Aug 2019 13:55:03 +0000 (15:55 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Tue, 27 Aug 2019 14:03:43 +0000 (16:03 +0200)
commit61621670ab3ea56eea6571cc9bba5e015c9f0861
tree32999e8c3ad159afb178beff4575b20d2d4c8ce3
parentaddfe2790a05cc7a6106ef66acd1d7e7d8845e4c
parent4d7f92457692ef00a591084390dc191f84c99628
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
net.mograsim.machine/src/net/mograsim/machine/mi/parameters/MnemonicFamily.java
net.mograsim.machine/src/net/mograsim/machine/mi/parameters/ParameterClassification.java