Merge branch 'noname2' into 'master'

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

diff --git a/.tx/merge-base b/.tx/merge-base
index de1b13bbc4bbd2a4a0a99a0aa88b1f9d9c69f101..0f5fe0e2f91b385a6cf7a0020d68a99f4046f3fd 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct  6 07:24:28 CEST 2019
+Fri Oct 18 07:24:34 CEST 2019