diff options
| author | Tim Newsome <tim@sifive.com> | 2023-11-30 12:18:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-30 12:18:33 -0800 |
| commit | d4c5d2657074613d429f57f60e939ca151ed4f32 (patch) | |
| tree | d27cec6041cc7ab2e554df61f02164435998832b /doc | |
| parent | e9484bab5466f9d6522dd0a29755a4cf2408c035 (diff) | |
| parent | 10af616067c659117b25448c9726828b009edcaa (diff) | |
| download | riscv-openocd-d4c5d2657074613d429f57f60e939ca151ed4f32.zip riscv-openocd-d4c5d2657074613d429f57f60e939ca151ed4f32.tar.gz riscv-openocd-d4c5d2657074613d429f57f60e939ca151ed4f32.tar.bz2 | |
Merge pull request #969 from aap-sc/aap-sc/final_november_2023_upstream_sync_fixup
fix erroneously-resolved merge conflict
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions