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 95558bedda63e69c779274b731b709d48eb79b68..204f42b38cdff87571b5bd1df88bd28634cb0442 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Feb  7 07:23:41 CET 2018
+Thu May 31 07:24:27 CEST 2018