]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
projects / francis / winuae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8047b7 3db348f)
Merge branch 'master' of github.com:tonioni/WinUAE
authorToni Wilen <twilen@winuae.net>
Tue, 29 Jul 2014 17:49:03 +0000 (20:49 +0300)
committerToni Wilen <twilen@winuae.net>
Tue, 29 Jul 2014 17:49:03 +0000 (20:49 +0300)

Trivial merge
WinUAE Amiga Emulator (auto-fetched).