?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: be7fadf 18dc343)
Merge branch 'master' into xcircuit-3.10
commitf963c0518387c16218d1456ebce67a1cc32dfe66
authorTim Edwards <tim@opencircuitdesign.com>
Mon, 24 Feb 2020 20:00:24 +0000 (24 15:00 -0500)
committerTim Edwards <tim@opencircuitdesign.com>
Mon, 24 Feb 2020 20:00:24 +0000 (24 15:00 -0500)
tree2e1deb1bad24822853f70f9207dfddab6da4ff69tree | snapshot (tar.gz zip)
parentbe7fadf40e60ec661cbeae0526be7ddafa23eda8commit | diff
parent18dc343fefeaa941f0ca224a5c97067914ae3cb2commit | diff
Merge branch 'master' into xcircuit-3.10

Conflicts:
.gitignore
VERSION

Commiting merge
XCircuit is a program for drawing publishable-quality electrical circuit schematic diagrams and related figures, and produce circuit netlists through schematic capture.