Remove g_duel_warmup (XPM ruleset turns on warmup when executed)

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 7861468f685b5479e31e480ef70ab886f3fa40bd..3512ca5dc542939aff93cadaafcc1544cf16655e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun May 20 07:24:18 CEST 2018
+Sun Sep 30 07:24:04 CEST 2018