X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a083faebfdf1ae65fde120303c463f71a7dee520;hb=1bedb9300b23b98c65d2c7babc3e4d013f7c2e17;hp=76619c83e92a518522ec5658e99e8b811f761bc6;hpb=1aa067f7cabad71604989b94b0bfae8fcf60d319;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 76619c83e..a083faebf 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul  3 07:23:48 CEST 2020
+Sat Aug 22 07:23:41 CEST 2020