URS: Refactored Item_GiveAmmoTo.

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd207969cced37b65c1e2d544ba5069c3e5..efe8262cb690e24a55eb2e0ea36348e8f7685b5d 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Sat Jul  8 07:24:47 CEST 2017