From 47549fbcf1edef644e45b50e3b7e586f630f8e86 Mon Sep 17 00:00:00 2001
From: Allofich <19624336+Allofich@users.noreply.github.com>
Date: Sat, 6 Mar 2021 22:04:01 +0900
Subject: [PATCH] Update CHANGELOG and skipped commits file

---
 CHANGELOG                                 | 2 ++
 patch-integration/Skipped SVN commits.txt | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 879b41c3e..50d79eb94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@
     logical to physical sector size. This allows the
     HDI image of Dragon Knight 4 to mount.
   - Integrated SVN commits (Allofich)
+    - r4416: Added ability to start and stop avi
+	recording, and to start keymapper, from config.
     - r4405: Smarter clearing of the dynrec cache.
 0.83.11
   - Added support for the clipboard device (CLIP$) and
diff --git a/patch-integration/Skipped SVN commits.txt b/patch-integration/Skipped SVN commits.txt
index 482bd418f..5bd49476c 100644
--- a/patch-integration/Skipped SVN commits.txt	
+++ b/patch-integration/Skipped SVN commits.txt	
@@ -68,3 +68,8 @@ Commit#:	Reason for skipping:
 4400		No "sBitfs" in DOSBox-X
 4407		Conflict
 4408		Conflict
+4411		What spacing do we want in DOSBox-X code?
+4413		Conflict
+4415		Conflict
+4417		No function definition in DOSBox-X, so unnecessary.
+4418		No C_SRECORD in DOSBox-X
\ No newline at end of file