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 1051c6f5c88c947a638f6361a20ec58e139b78f6..4d7d48d7f8904c54792c24031b9521c120f15f29 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar 29 07:23:09 CEST 2022
+Tue May  3 07:23:14 CEST 2022