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 275b04252b6ad52b368397cfcdc8c347a85571b5..431dcbe974dc57728a788a275a92bcbc985444ca 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May  2 07:23:47 CEST 2017
+Sat Mar 17 07:23:46 CET 2018