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)
commit6ff3b2499ceaf911252f634d44469fefb58952ae
tree500cb46b942c1169c577705320533b80e902336b
parentfda8879e2f721e4a01f8f9e946ac9cf6d1d1a363
parentcdd661d844ec4e8a449142b204b3955d2201858c
Merge pull request #342 from mkj/orangecrab-merge

Orangecrab working with litedram

Fixed up a few simple merge conflicts in the Makefile.