Fix FL_WEAPON flag overlapping FL_JUMPRELEASED. This unintentional change was introdu...

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 49a351bdbf937d2a0a876fd83b48685ec0a2c2d3..ec17f2cf065289250fea65eb9600e8e87d4c3178 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 24 07:23:11 CEST 2022
+Wed Apr 10 07:22:59 AM CEST 2024