Commit graph

6 commits

Author SHA1 Message Date
Andrea Odetti
21156bb606 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	source/Disk.cpp
#	source/DiskImageHelper.h
#	source/Memory.cpp

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2018-02-03 20:35:04 +00:00
tomcw
02a6df73c5 DiskFormat: tweaks and fixed some TODOs in comments 2018-01-20 17:18:24 +00:00
Andrea Odetti
26f4532cb8 Minimal changes to ensure compilation in Linux / gcc.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
2017-10-14 19:18:44 +01:00
tomcw
3edb78203e Refactor: polymorphically call CImageHelperBase Open() & Close() 2016-10-25 22:26:28 +01:00
tomcw
6a26a95487 PCH refactor: remove non-system headers from stdafx.h 2014-08-13 21:30:35 +01:00
tomcw
d591dd006b Remove the top-level AppleWin folder 2014-05-23 22:59:02 +01:00
Renamed from AppleWin/source/DiskImageHelper.h (Browse further)