Don't set wasFlying on the client, waste of CPU

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 0d2f0c2939c18d4cd346221e800576213bce67b1..b2b2ddca631fe972b7a6fe63d6ecdf789d678128 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jan 11 07:37:55 CET 2015
+Fri Jan 15 22:48:00 CET 2016