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 3c39db40843db478aa84893d3e51842a48290e11..431dcbe974dc57728a788a275a92bcbc985444ca 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 24 07:24:42 CET 2018
+Sat Mar 17 07:23:46 CET 2018