]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
projects / francis / winuae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f88faf3 ceff388)
Merge branch 'master' of github.com:tonioni/WinUAE
authorToni Wilen <twilen@winuae.net>
Tue, 9 Jan 2018 18:40:25 +0000 (20:40 +0200)
committerToni Wilen <twilen@winuae.net>
Tue, 9 Jan 2018 18:40:25 +0000 (20:40 +0200)

Trivial merge
WinUAE Amiga Emulator (auto-fetched).