Commit 18f0d413 authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch 'master' into removeunused

# Conflicts:
#	build.sbt
#	src/test/scala/chiselTests/StrongEnum.scala
#	src/test/scala/chiselTests/stage/phases/AddImplicitOutputFileSpec.scala
parents 7e275e11 5271e89c
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment