X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=25aec9d460c9e902d48c89b007064a6500007437;hp=42ea6ccdca27a01ccd61f46e5a32691c4351af7f;hb=5934e5ea9e6f26b1c51cffd40aa3ae3344d79532;hpb=edc317efa7b44478e7bd5c2ba46eff432c603ea6

diff --git a/.tx/merge-base b/.tx/merge-base
index 42ea6ccdca..25aec9d460 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun 20 07:23:43 CEST 2020
+Mon Jul 13 07:23:53 CEST 2020