?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: f963c05 70ee76f)
Merge branch 'master' into xcircuit-3.103.10.18
commit6c6021d8cb9343cf435fc25ae4ab8d26080bc03d
authorTim Edwards <tim@opencircuitdesign.com>
Mon, 24 Feb 2020 21:00:19 +0000 (24 16:00 -0500)
committerTim Edwards <tim@opencircuitdesign.com>
Mon, 24 Feb 2020 21:00:19 +0000 (24 16:00 -0500)
treee161af4554b4aa9acbac3dc28c0adc9276f7a79btree | snapshot (tar.gz zip)
parentf963c0518387c16218d1456ebce67a1cc32dfe66commit | diff
parent70ee76fa446ccc5a3d2caffe5bf93016688d47cbcommit | diff
Merge branch 'master' into xcircuit-3.10

Conflicts:
VERSION

Updated version to match master
XCircuit is a program for drawing publishable-quality electrical circuit schematic diagrams and related figures, and produce circuit netlists through schematic capture.