Dolu1990 6aa6191240 Merge branch 'master' into dev ... # Conflicts: # build.sbt # src/main/scala/vexriscv/Riscv.scala # src/main/scala/vexriscv/ip/DataCache.scala # src/main/scala/vexriscv/plugin/DBusSimplePlugin.scala # src/main/scala/vexriscv/plugin/MmuPlugin.scala # src/test/cpp/regression/makefile # src/test/scala/vexriscv/TestIndividualFeatures.scala		2021-01-30 20:30:21 +01:00
..
c	Merge pull request #115 from antmicro/fix_emulator	2020-04-07 12:29:40 +02:00
ressource/hex	Remap Briey/Murax onChipRam to 0x80000000 to avoid having memory at the null pointer location	2018-02-05 16:16:27 +01:00
scala	Merge branch 'master' into dev	2021-01-30 20:30:21 +01:00