Merge branch 'development' into json-fix-extended
authorChristian Femers <femers@in.tum.de>
Tue, 3 Sep 2019 06:12:38 +0000 (08:12 +0200)
committerChristian Femers <femers@in.tum.de>
Tue, 3 Sep 2019 06:12:38 +0000 (08:12 +0200)
commitc3f6c48944beecd51a41a6e9c123b73d8b630dfb
tree1c6867809b856c031b566a097644f3bc814df2b5
parentccf83da0021c673571ef8d8e42631d76808d6b3d
parent6818878737a9de0075976f79157e07283e7713d7
Merge branch 'development' into json-fix-extended

Conflicts:
net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
net.mograsim.machine/META-INF/MANIFEST.MF
net.mograsim.logic.model.am2900/META-INF/MANIFEST.MF
net.mograsim.machine/META-INF/MANIFEST.MF