| commit | eb4fc5aef754433d314b74025297ffd897fa594f | |
| author | Tim Edwards <tim@opencircuitdesign.com> | |
| Mon, 6 Jul 2020 01:36:30 +0000 (5 21:36 -0400) | ||
| committer | Tim Edwards <tim@opencircuitdesign.com> | |
| Mon, 6 Jul 2020 01:36:30 +0000 (5 21:36 -0400) | ||
| tree | 90a82285f9ce6591d1154aa5d5f8749def1fbf86 | treesnapshot (tar.gz zip) |
| parent | 291f6e66aae069ae5203974b6eddb9a0a8a88c1f | commitdiff |
| parent | 97d13f3926dc2ac94c647c7b48bf1a2aff1627df | commitdiff |
Merge branch 'xcircuit-3.10' of localhost:/home/tim/gitsrc/xcircuit/ into xcircuit-3.10
Conflicts:
Makefile
VERSION
Xw/Makefile
asg/Makefile
config.status
spiceparser/Makefile
Resolved conflicts stemming from updating the Makefiles and not properly
ignoring the Makefiles.
Conflicts:
Makefile
VERSION
Xw/Makefile
asg/Makefile
config.status
spiceparser/Makefile
Resolved conflicts stemming from updating the Makefiles and not properly
ignoring the Makefiles.
| Makefile | diff1 | diff2 | blobhistory |
| asg/Makefile | diff1 | diff2 | blobhistory |
| events.c | diff1 | diff2 | blobhistory |