Merge branch 'master' into terencehill/bot_ai

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 9bae7e1cd52108d1e3cb14b7f872ea63e693c7be..ca7140deb4f39043ced90c760624d498c0f1b2a1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu May 17 07:24:26 CEST 2018
+Wed Jun 20 07:24:25 CEST 2018