Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/.tx/merge-base b/.tx/merge-base
index efe8262cb690e24a55eb2e0ea36348e8f7685b5d..204f42b38cdff87571b5bd1df88bd28634cb0442 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul  8 07:24:47 CEST 2017
+Thu May 31 07:24:27 CEST 2018