Robert Guballa 1ff4c9397c Merge branch 'architect' ...

# Conflicts:
#	cmake-build-debug/CMakeFiles/Prog3B.dir/gamecube.cpp.obj
#	cmake-build-debug/CMakeFiles/Prog3B.dir/main.cpp.obj
#	cmake-build-debug/Prog3B.exe
#	cmake-build-debug/Testing/Temporary/LastTest.log

2025-11-17 13:11:47 +01:00

..

v1

Merge branch 'architect'

2025-11-17 13:11:47 +01:00