From 8011cb28446db0f297cb39cb27477c938dc0bdca Mon Sep 17 00:00:00 2001
From: HammerGS <drivingguy@hotmail.com>
Date: Sat, 10 Feb 2024 09:22:23 -0700
Subject: [PATCH] Merging PR's

+ PR #5146: planetary conditions weather updates
+ PR #5140: BA tech advancement for Exoskeltons.
---
 megamek/docs/history.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
index 6bb80d2c39f..9f50a094d54 100644
--- a/megamek/docs/history.txt
+++ b/megamek/docs/history.txt
@@ -52,6 +52,8 @@ MEGAMEK VERSION HISTORY:
 + PR #5126: turn timer updates
 + PR #5132: Fix Long Tom Cannon not dealing damage to flying dropship
 + Fix #5104: To-hit calculation bug when shooting at VTOLs
++ PR #5146: planetary conditions weather updates 
++ PR #5140: BA tech advancement for Exoskeltons.
 
 0.49.17 (2023-12-31 1900 UTC)
 + Fix #1031: Show structure collapse warning when deploying and moving.