projects / c4m-jtag.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce0e268 091aa37)
Merge rebased_on_upstream into master
authorStaf Verhaegen <staf@stafverhaegen.be>
Wed, 21 Apr 2021 18:23:34 +0000 (20:23 +0200)
committerStaf Verhaegen <staf@stafverhaegen.be>
Wed, 21 Apr 2021 18:23:34 +0000 (20:23 +0200)
Some commits were upstreamed and the rest was rebased on upstream master.
Then the was merged in out master to keep continuos stream of commits.


Trivial merge