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 9745f61361ea974460edaf8e9c90a96700d78cb1..64801e8544f67a40360a6775dc18130a6a626921 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jun  3 07:24:16 CEST 2018
+Tue Nov 27 07:24:07 CET 2018