Hook: infinite ammo in mutator

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

diff --git a/.tx/merge-base b/.tx/merge-base
index f78e6e247e48867d44d1451efcb036ba4cadfe59..b0c891bbe5a7864b64d51f6a4f719d66c54d03ac 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 21 07:51:44 CET 2014
+Mon Aug 31 21:02:59 CEST 2015