eyck bcea3ddf39 Merge branch 'develop' ...

# Conflicts:
#	.cproject
#	.gitmodules
#	.settings/language.settings.xml
#	conanfile.txt
#	examples/simple_system/CMakeLists.txt
#	examples/simple_system/gen/e300_plat_t.h
#	examples/simple_system/gpio.cpp
#	examples/simple_system/plic.cpp
#	examples/simple_system/sc_main.cpp
#	examples/simple_system/simple_system.cpp
#	examples/transaction_recording/CMakeLists.txt
#	examples/transaction_recording/scv_tr_recording_example.cpp

2020-04-23 16:42:23 +02:00

129 B

Raw Blame History

View Raw