git.unchartedbackwaters.co.uk Git - francis/winuae.git/commit

]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commit

projects / francis / winuae.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 181b608 ef88d2f)

author	Dimitris Panokostas <midwan@gmail.com>
	Thu, 2 Mar 2023 15:27:52 +0000 (16:27 +0100)
committer	Dimitris Panokostas <midwan@gmail.com>
	Thu, 2 Mar 2023 15:27:52 +0000 (16:27 +0100)
commit	26d0c8aecf493b1d2d8f2d6e64d84a83011d971e
tree	5dbf996e343b44609d653be77c27ab3a3dca5208	tree \| snapshot
parent	181b608fdb6029d69958e7762fa14183aff4c2a8	commit \| diff
parent	ef88d2f76874bb01068069a4d2aee50f999b4176	commit \| diff

Merge branch 'midwan' into add-missing-ifdefs

15 files changed:

audio.cpp	diff1 \|	diff2 \|	blob \| history
blitter.cpp	diff1 \|	diff2 \|	blob \| history
cia.cpp	diff1 \|	diff2 \|	blob \| history
custom.cpp	diff1 \|	diff2 \|	blob \| history
devices.cpp	diff1 \|	diff2 \|	blob \| history
disk.cpp	diff1 \|	diff2 \|	blob \| history
drawing.cpp	diff1 \|	diff2 \|	blob \| history
filesys.cpp	diff1 \|	diff2 \|	blob \| history
fpp.cpp	diff1 \|	diff2 \|	blob \| history
gayle.cpp	diff1 \|	diff2 \|	blob \| history
inputdevice.cpp	diff1 \|	diff2 \|	blob \| history
main.cpp	diff1 \|	diff2 \|	blob \| history
memory.cpp	diff1 \|	diff2 \|	blob \| history
newcpu.cpp	diff1 \|	diff2 \|	blob \| history
savestate.cpp	diff1 \|	diff2 \|	blob \| history

WinUAE Amiga Emulator (auto-fetched).