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 95e7fe5945fbd4fea49ec3aed59826f71bcbcc44..53527f3c728703d8d1aa6e9f5fc126198c7d0dbf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  4 07:23:50 CEST 2017
+Fri Apr 20 07:23:54 CEST 2018