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 918981327caf744f999102c25d1b4d927f78eeee..573a066e31bef33771349987f35204060b3c1804 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul  6 07:24:37 CEST 2017
+Sun Apr 29 07:23:51 CEST 2018