tree dfe64b2a2323b0ca14a0209126f27e21c8500267
parent 862eeac7c9e6e475aba3dc122e3626e2ab36e487
parent 88b2b7fbfaa27e15f49452fd31d03a45aa7096dd
author Tim Edwards <tim@opencircuitdesign.com> 1599668540 -0400
committer Tim Edwards <tim@opencircuitdesign.com> 1599668540 -0400

Merge branch 'master' of opencircuitdesign.com:/home/tim/gitsrc/open_pdks/

Conflicts:
	common/spectre_to_spice.py

Merged additional code for spectre_to_spice.py.