]> git.sesse.net Git - pistorm/commit
Merge remote-tracking branch 'niklasekstrom/autoconfig_a314' into wip-crap
authorPaulo Duarte <paulo.duarte@robertwalters.com>
Sat, 15 May 2021 23:30:45 +0000 (00:30 +0100)
committerPaulo Duarte <paulo.duarte@robertwalters.com>
Sat, 15 May 2021 23:30:45 +0000 (00:30 +0100)
commit5762d343fa675103bf067938887b6f726cf8e149
tree904bf2e5ac6da8debe5fd5b7a95369d30a549c66
parent457f89dad1671335967cf9d45ed99887fbf49a55
parentd926b66c4cb06a963d1bc8d58c1c504346a95ffd
Merge remote-tracking branch 'niklasekstrom/autoconfig_a314' into wip-crap

# Conflicts:
# .gitignore
# emulator.c
# run.sh
Makefile