From: Fabian Stemmler <stemmler@in.tum.de>
Date: Wed, 11 Sep 2019 15:11:45 +0000 (+0200)
Subject: Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim... 
X-Git-Url: https://mograsim.net/gitweb/?p=Mograsim.git;a=commitdiff_plain;h=662fb8ae0007c317aa210b1de50499b47f38477a

Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development
---

662fb8ae0007c317aa210b1de50499b47f38477a
diff --cc net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
index 6f0ac00f,86f578bc..de38b1a0
--- a/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
+++ b/net.mograsim.logic.model.am2900/components/net/mograsim/logic/model/am2900/components/am2901/Am2901.json
@@@ -774,9 -774,9 +774,9 @@@
        },
        {
          "id": "WireCrossPoint",
-         "name": "WireCrossPoint#48",
+         "name": "WireCrossPoint#46",
          "pos": {
 -          "x": 144.0,
 +          "x": 424.0,
            "y": 1079.0
          },
          "params": 1