Merge branch 'master' into Lyberta/WaypointIcons

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

diff --git a/.tx/merge-base b/.tx/merge-base
index d15698b68730a588bc9947b1ab0d36958f1fe1c1..5b64a38bc7e59eac8e624319a97e068b5540a022 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 23 07:24:17 CEST 2018
+Sun Aug  9 07:25:00 CEST 2020