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 0f4d533661e1fc2767273c5c4b2bbdbc4e67503e..ca7140deb4f39043ced90c760624d498c0f1b2a1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Feb 27 07:23:43 CET 2018
+Wed Jun 20 07:24:25 CEST 2018