X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c4f4715ed5da0500fefe3ede6cc3a265de734b62;hb=36aba23c89a9046509b2674e3cf9f93a82dbaf22;hp=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hpb=ad2d918472c84295255fba550959b58cacc9cfb1;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c..c4f4715ed 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Sun Feb 16 07:24:24 CET 2020