]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
projects / francis / winuae.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51ca0c3 18a1064)
Merge branch 'master' of github.com:tonioni/WinUAE
authorToni Wilen <twilen@winuae.net>
Sun, 20 Sep 2015 10:33:36 +0000 (13:33 +0300)
committerToni Wilen <twilen@winuae.net>
Sun, 20 Sep 2015 10:33:36 +0000 (13:33 +0300)
1  2 
cfgfile.cpp patch | diff1 | diff2 | blob | history

diff --cc cfgfile.cpp
Simple merge
WinUAE Amiga Emulator (auto-fetched).