Commit 8a82411fe2c0cd71529685398d3f26f431518974
authorManfred Steiner <sx@htl-kaindorf.at>
Sat, 30 Sep 2023 15:36:10 +0000 (17:36 +0200)
committerManfred Steiner <sx@htl-kaindorf.at>
Sat, 30 Sep 2023 15:36:10 +0000 (17:36 +0200)
treeda6988a34b57288c0d505b756ac501085ea9e713
parent9d7be97b6830f6e5a0e794b70b7b4a7ee95f049f
parent405b66cebf64e989e30afbd345e26b8d98a22116
Message:
merge witch master-sx, conflicts resolved
4 files changed:
examples/simuc/Makefile
examples/simuc/src/main.cpp
examples/simuc/src/simavr/simavr.cpp
examples/simuc/src/simavr/simavr.h