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 ba83f7ff83e3ef8a77b7601b135a4f3940a7dd77..64801e8544f67a40360a6775dc18130a6a626921 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jul 10 07:24:23 CEST 2018
+Tue Nov 27 07:24:07 CET 2018