Merge branch 'master' into terencehill/bot_waypoints

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 3a34f2b81bec754eb41f2676daec2210cd05a534..27d0db5ace70b7062d64d3138ea86384f87ba81f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 16 07:25:19 CET 2018
+Tue Jul 30 07:24:47 CEST 2019