Block latent bot movement when it's dead or spectating

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f91678e3679ca1319d64b136fed8b8413e0050f3..d03c707af970540f1b97e8909029f4fb086f3843 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jan 15 17:04:50 CET 2016
+Tue May 10 21:52:13 CEST 2016