diff options
| author | Tim Newsome <tim@sifive.com> | 2021-06-21 12:51:04 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2021-06-21 12:51:04 -0700 |
| commit | 7d3cd4e740f02c78773bd21cb5e32eb8d5ad360e (patch) | |
| tree | 690524979c5b53f3b1b4c462857a8dcafc8fcbd7 /git-hooks | |
| parent | f4950b7c5d4a3ead9b1433c4ea6f3bbf3a540f9c (diff) | |
| parent | ee4aa33644df36607750d23d97f84d15b9e71db6 (diff) | |
| download | riscv-openocd-7d3cd4e740f02c78773bd21cb5e32eb8d5ad360e.zip riscv-openocd-7d3cd4e740f02c78773bd21cb5e32eb8d5ad360e.tar.gz riscv-openocd-7d3cd4e740f02c78773bd21cb5e32eb8d5ad360e.tar.bz2 | |
Merge branch 'from_upstream' into fix_merge
Should result in no changes, but now I will probably merge the PR so git
knows the merge happened. (I accidentally did a squash merge before.)
Change-Id: I939492c0b1ef181ccb3f3158e5fc3a0626a60412
Diffstat (limited to 'git-hooks')
0 files changed, 0 insertions, 0 deletions