X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=188907c41507edd6dce4c81d5a790c16d87d3371;hb=98c9fe0eefaa40c82f8d536559ce0e17c519f82b;hp=037aa1c8127233f7b1b7485dc30e069e40b60419;hpb=53c87b81040e9c1d52320952a9c3a06d3429be3b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 037aa1c81..188907c41 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul 18 07:23:53 CEST 2020
+Tue Aug  4 07:23:45 CEST 2020