Fix crylink and vaporizer being able to fire with empty magazines

[xonotic/xonotic-data.pk3dir.git] / .tx / merge-base

diff --git a/.tx/merge-base b/.tx/merge-base
index f0b6f4c4ba9505d199a4b9b9a4c0781513e77e18..62088368acce8c56cfed1aa14b4061a07e777505 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 20 07:23:54 CET 2022
+Sun 16 Apr 2023 07:24:58 AM CEST