Use player glow color as leader waypoint color

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 4b64ea073cc7e8ffe7ef2f5f159190eacb7af617..15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 07:24:32 CEST 2019
+Wed Apr  8 07:24:18 CEST 2020