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 0f4d533661e1fc2767273c5c4b2bbdbc4e67503e..53527f3c728703d8d1aa6e9f5fc126198c7d0dbf 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Feb 27 07:23:43 CET 2018
+Fri Apr 20 07:23:54 CEST 2018