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 ecaa77f6e785c09163db014b357b06ede206c671..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jan 30 07:24:21 CET 2019
+Thu Sep 12 07:24:50 CEST 2019