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 b9ecf35af22720c24c6ac2781de1d2b441fdc103..a3b74888d22f294a4ece909a299937c62cb2d575 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov 22 07:24:57 CET 2020
+Sun Apr  4 07:24:52 CEST 2021