Replace some ammo field references with resources

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd207969cced37b65c1e2d544ba5069c3e5..9745f61361ea974460edaf8e9c90a96700d78cb1 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Sun Jun  3 07:24:16 CEST 2018