Andrew Waterman 5f33ab24b0 fix merge conflict ...

oops :(

2012-03-06 02:02:53 -08:00

rocket/src/main/scala

fix merge conflict

2012-03-06 02:02:53 -08:00

Description

Rocket Chip Generator (https://github.com/freechipsproject/rocket-chip)

13 MiB

Languages

Scala 93.1%

C++ 2.1%

Python 2%

Makefile 1.2%

Verilog 0.8%

Other 0.7%