diff options
| author | Tim Newsome <tim@sifive.com> | 2021-05-03 11:01:37 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-05-03 11:04:15 -0700 |
| commit | 927c4db298bf4bd7fe71b332ca819336897fbb3b (patch) | |
| tree | 928fdb41c505ac0760985869b6e76369ac98f5a5 /git-hooks/commit-msg | |
| parent | 703960cba799e38508944484095f2c2131bf933b (diff) | |
| parent | a115b589a71d665787759cf8f2ff07210fd47164 (diff) | |
| download | riscv-openocd-927c4db298bf4bd7fe71b332ca819336897fbb3b.zip riscv-openocd-927c4db298bf4bd7fe71b332ca819336897fbb3b.tar.gz riscv-openocd-927c4db298bf4bd7fe71b332ca819336897fbb3b.tar.bz2 | |
Merge branch 'master' into from_upstream
I may have broken memory sampling with this merge.
Conflicts:
doc/openocd.texi
src/helper/command.c
src/jtag/drivers/ftdi.c
src/rtos/FreeRTOS.c
Change-Id: I2b7e09b2d3b244db546c5212532e6b48fb66dca4
Diffstat (limited to 'git-hooks/commit-msg')
0 files changed, 0 insertions, 0 deletions