From e03ab0f015058edbbb54104ae6f07e0064607a9d Mon Sep 17 00:00:00 2001
From: HammerGS <drivingguy@hotmail.com>
Date: Mon, 15 Jan 2024 08:49:24 -0700
Subject: [PATCH] Merging PR's

Double Click Player Settings Window is Sticky, potentially forcing hard
close.
---
 megamek/docs/history.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index 88814daa37f..fdc3535eca6 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -23,7 +23,7 @@ MEGAMEK VERSION HISTORY:
 + PR #5009: Searchlights are no longer auto-enabled during daytime
 + Fix #5046: RFE: Search by MUL ID in advanced search.
 + Fix #5051: RFE: Improve the Invalid Reasons display
-+ PR #4985: Add in game force display dialog
+C
 
 0.49.17 (2023-12-31 1900 UTC)
 + Fix #1031: Show structure collapse warning when deploying and moving.