Put GameLogInit() code in there instead of in spawnfunc(worldspawn)

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7044dd87b04a0380ba634bd2d1c530c034172967..4d7d48d7f8904c54792c24031b9521c120f15f29 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Feb  4 07:23:04 CET 2022
+Tue May  3 07:23:14 CEST 2022