Merge remote-tracking branch 'origin/terencehill/bot_waypoints'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 6d3cbe531f5acfa82e643da05e53f5952c5a1ecb..64801e8544f67a40360a6775dc18130a6a626921 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Nov  4 07:24:04 CET 2018
+Tue Nov 27 07:24:07 CET 2018