Commit c4c0d28a authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch 'master' into exception_handling

# Conflicts:
#	chiselFrontend/src/main/scala/chisel3/Aggregate.scala
#	chiselFrontend/src/main/scala/chisel3/Attach.scala
#	chiselFrontend/src/main/scala/chisel3/Bits.scala
#	chiselFrontend/src/main/scala/chisel3/Data.scala
#	chiselFrontend/src/main/scala/chisel3/Printable.scala
#	chiselFrontend/src/main/scala/chisel3/SeqUtils.scala
#	chiselFrontend/src/main/scala/chisel3/StrongEnum.scala
#	chiselFrontend/src/main/scala/chisel3/core/BlackBox.scala
#	chiselFrontend/src/main/scala/chisel3/core/Module.scala
#	chiselFrontend/src/main/scala/chisel3/internal/BiConnect.scala
#	chiselFrontend/src/main/scala/chisel3/internal/Binding.scala
#	chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
#	chiselFrontend/src/main/scala/chisel3/internal/MonoConnect.scala
#	src/main/scala/chisel3/Driver.scala
#	src/main/scala/chisel3/internal/firrtl/Converter.scala
#	src/main/scala/chisel3/package.scala
#	src/main/scala/chisel3/util/Bitwise.scala
#	src/main/scala/chisel3/util/experimental/BoringUtils.scala
#	src/main/scala/chisel3/util/experimental/LoadMemoryTransform.scala
parents 8a4acb63 820e2688
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