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 522b47f1e0a7d81c2fd9d63255aa4a73d05e74f3..62088368acce8c56cfed1aa14b4061a07e777505 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 27 07:24:06 CET 2022
+Sun 16 Apr 2023 07:24:58 AM CEST