projects / microwatt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fda8879 cdd661d)
Merge pull request #342 from mkj/orangecrab-merge
authorMichael Neuling <mikey@neuling.org>
Tue, 18 Jan 2022 02:27:27 +0000 (13:27 +1100)
committerGitHub <noreply@github.com>
Tue, 18 Jan 2022 02:27:27 +0000 (13:27 +1100)
Orangecrab working with litedram

Fixed up a few simple merge conflicts in the Makefile.


Trivial merge