X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ad6e6be38bf763676a3643a70c502db7f0092fdb;hb=37c14ca046ac2b3cf3d539ae6e33e00c78f794e2;hp=76b17ee0d96cbfc3d0e9f6020d21617e2e0f24b3;hpb=07a09abd9a97bbd7939e38bea4841e7d5e88dcce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 76b17ee0d..ad6e6be38 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed May 13 07:23:38 CEST 2020
+Mon Aug 10 07:23:44 CEST 2020