Merge branch 'master' into Mario/weaponarena_available

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

diff --git a/.tx/merge-base b/.tx/merge-base
index c192fc5a92acaf61e7de52fe69cd9e8aeda18c43..27d0db5ace70b7062d64d3138ea86384f87ba81f 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Dec 13 15:47:45 CET 2018
+Tue Jul 30 07:24:47 CEST 2019