Merge branch 'master' into martin-t/echo

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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1b3a88679805a8a3a82fee24245aea00bcee75a8..67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May  1 07:24:23 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019