Bot waypoints: fix waypoint creation for certain ladders and jumppads (rare cases)

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

diff --git a/.tx/merge-base b/.tx/merge-base
index c4e582b2cb2d2f7081713dd7e9ef017568faa6a0..6d3cbe531f5acfa82e643da05e53f5952c5a1ecb 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May  2 07:24:03 CEST 2018
+Sun Nov  4 07:24:04 CET 2018