diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2018-08-08 10:48:05 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-08-08 10:48:05 +0200 |
commit | 5df90bc5a5a273f5c50764f4045012b282e7fa36 (patch) | |
tree | 5f91c9800f958a810441120794dd28572e401c6f /COPYING | |
parent | b0741e292c7ec7191f2c92fe7695e34018469b67 (diff) | |
parent | 8553573d2485ac2ec60d1c49949c254e02d35490 (diff) | |
download | nextpnr-5df90bc5a5a273f5c50764f4045012b282e7fa36.tar.gz nextpnr-5df90bc5a5a273f5c50764f4045012b282e7fa36.tar.bz2 nextpnr-5df90bc5a5a273f5c50764f4045012b282e7fa36.zip |
Merge remote-tracking branch 'origin/master' into common_main
# Conflicts:
# ecp5/main.cc
# ice40/main.cc
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions