Merge remote-tracking branch 'upstream/master'
authorJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:08:20 +0000 (14:08 -0800)
committerJim Lawson <ucbjrl@berkeley.edu>
Tue, 18 Dec 2018 22:08:20 +0000 (14:08 -0800)
commitf4d500f98e0e298a98099ec2177b43571e9cda61
treee39952065ae50763d5ef47ec1495ad234eaca59e
parent3bb9288d65f547085b79fbaffb7046f336ff7f59
parent2d73e1b60a43f2a621b387768134b83054f59e89
Merge remote-tracking branch 'upstream/master'

# Conflicts:
# CHANGELOG
# frontends/verific/verific.cc
# frontends/verilog/verilog_parser.y
CHANGELOG