mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-10-13 17:48:10 +08:00
d7b46afcd4
Fix Bit8u instead of char weirdness for imageDisk Give the code that moves the Z drive its own function for readability. Give size arrays default values again for warning program. (IMGMOUNT rewrite part of original commit skipped due to code conflict)
39 lines
872 B
Plaintext
39 lines
872 B
Plaintext
Commit#: Reason for skipping:
|
|
|
|
4038 Conflict
|
|
4049 Conflict
|
|
4055 Conflict
|
|
4056 Not sure if needed
|
|
4065 Might conflict
|
|
4066 Conflict
|
|
4067 Conflict
|
|
4074 Conflict
|
|
4075 MAME sound. Merged into DOSBox-X except for Tandy sound, due to conflicts.
|
|
4076 Unknown if needed
|
|
4077 Conflict
|
|
4093 Conflict
|
|
4094 Conflict
|
|
4095 Conflict
|
|
4111 Conflict
|
|
4129 Partial conflict
|
|
4132 Conflict
|
|
4141 MAME sound. Merged into DOSBox-X except for Tandy sound, due to conflicts.
|
|
4147 Conflict
|
|
4165 Not sure if needed
|
|
4174 Conflict
|
|
4178 Conflict
|
|
4199 Conflict
|
|
4200 Conflict
|
|
4206 Caused unexpected "DYNREC:Can't run code in this page" error
|
|
4215 Conflict
|
|
4228 Not sure if needed
|
|
4229 Conflict
|
|
4235 Conflict
|
|
4245 Conflict
|
|
4267 IMGMOUNT rewrite part skipped due to conflict
|
|
|
|
(Status for commits in this interval needs to be added)
|
|
|
|
4357 Conflict
|
|
4360 Conflict
|
|
4367 Conflict |