diff --git a/CHANGELOG b/CHANGELOG index 06177be9d..84102c0c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -71,7 +71,9 @@ - Fixed that the "Save" button in Configuration Tool did not save config file in last version. (Wengier) - Integrated SVN commits (Allofich) - - r4330: some big endian improvents and drive_fat + - r4336: Correct an oversight of r4186 when floppy + disks are mounted. + - r4330: some big endian improvements and drive_fat fixes. (jmarsh) - r4320: Report Q-Channel track number in BCD, meaning it is not converted to binary by the diff --git a/patch-integration/Skipped SVN commits.txt b/patch-integration/Skipped SVN commits.txt index 284503d93..4e010a563 100644 --- a/patch-integration/Skipped SVN commits.txt +++ b/patch-integration/Skipped SVN commits.txt @@ -49,6 +49,8 @@ Commit#: Reason for skipping: 4325 Fix to 4065, which was skipped 4326 Conflict 4329 Conflict +4334 Conflict +4335 Conflict (Commits in this interval are still TODO)