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