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 b2f289cd348c43bca516254e066c648e98d2b40c..22200e07fbaa96b1573a6e7d479516e053fabd01 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Feb  8 07:23:38 CET 2018
+Sat Jul 14 07:24:18 CEST 2018