diff options
| author | Tim Newsome <tim@sifive.com> | 2020-12-31 13:40:49 -0800 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2020-12-31 13:40:49 -0800 |
| commit | 11b8110443bbd158f73c7bf00a52bd6863d6b42f (patch) | |
| tree | 23cb0e565256d2c94b0774acbf8156f19e409ef2 /.gitmodules | |
| parent | b8620764c09cbb05d8179fd5f520110fee114417 (diff) | |
| parent | c69b4deae36a7bcbab5df80ec2a5dbfd652e25ac (diff) | |
| download | riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.zip riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.tar.gz riscv-openocd-11b8110443bbd158f73c7bf00a52bd6863d6b42f.tar.bz2 | |
Merge branch 'master' into from_upstream
Conflicts:
.github/workflows/snapshot.yml
.gitmodules
src/flash/nor/drivers.c
src/helper/jep106.inc
src/rtos/hwthread.c
src/target/riscv/riscv.c
src/target/target.c
Change-Id: I62f65e10d15dcda4c405d4042cce1d96f8e1680a
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index b99c87a..410a2c2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "jimtcl"] path = jimtcl - url = https://github.com/msteveb/jimtcl + url = https://github.com/msteveb/jimtcl.git |