Skip to content
GitLab
Commit 5cc147f4 authored by Jim Lawson's avatar Jim Lawson
Browse files

Merge branch 'master' into 3.0.1 

# Conflicts:
#	chiselFrontend/src/main/scala/chisel3/core/BlackBox.scala
#	chiselFrontend/src/main/scala/chisel3/core/Module.scala
#	chiselFrontend/src/main/scala/chisel3/core/UserModule.scala
parents 520fafe4 e2765711
Pipeline #907 failed with stages
in 0 seconds