Commit 7926abcb authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch 'master' into repackagecore-testbed

# Conflicts:
#	chiselFrontend/src/main/scala/chisel3/Bits.scala
#	chiselFrontend/src/main/scala/chisel3/Data.scala
#	chiselFrontend/src/main/scala/chisel3/experimental/Annotation.scala
#	chiselFrontend/src/main/scala/chisel3/experimental/StrongEnum.scala
#	chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
#	src/main/scala/chisel3/internal/firrtl/Converter.scala
#	src/main/scala/chisel3/package.scala
#	src/main/scala/chisel3/util/MixedVec.scala
#	src/test/scala/chiselTests/AnnotationNoDedup.scala
#	src/test/scala/chiselTests/Direction.scala
#	src/test/scala/chiselTests/StrongEnum.scala
parents b757cf74 fe5571d5
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