Don't use set on the skill cvar, as it's an engine cvar and therefore predefined

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9040f2bfac581fc4f80b8b5b7583eb3ca90d6edb..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jun  3 07:24:29 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019