Update skipped SVN commits

This commit is contained in:
Allofich
2019-04-28 23:46:15 +09:00
parent d82e83deb9
commit 2fb3eed72b

View File

@@ -5,4 +5,8 @@ Commit#: Reason for skipping:
3837 References midi.h, from skipped 3835.
3838 Related to skipped commit 3836.
3846 Large commit
3847 Conflicts with https://github.com/joncampbell123/dosbox-x/commit/ac70b5599fb2fb824be7ed627ec4e70aa8b6bc79
3847 Conflicts with https://github.com/joncampbell123/dosbox-x/commit/ac70b5599fb2fb824be7ed627ec4e70aa8b6bc79
3857 Conflicts with DOSBox-X
3859 Conflicts with DOSBox-X. Masking/wrapping is implemented in DOSBox-X by masking the array access per pixel.
3863 Conflicts with DOSBox-X
3865 Conflicts with DOSBox-X