Recycle the lifetime field instead of using a dedicated field in the nexball code

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d3611b7852442d2ed64cc78e0c3f37ed37e0e27d..a3b74888d22f294a4ece909a299937c62cb2d575 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Nov 19 07:23:51 CET 2020
+Sun Apr  4 07:24:52 CEST 2021