X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=8e5f2c73fc107746321a4462e83e1be4a1ff69e6;hb=f8d356f8eb49655dc63000bec33637b6f7aa6ffa;hp=bb3feb0b51d329d70646323c2d4d53ce11690ee0;hpb=700e216d21c55f70a992e2b2a62fd5b0c75b6911;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index bb3feb0b5..8e5f2c73f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Jul 20 07:23:45 CEST 2020
+Sat Aug  1 07:23:42 CEST 2020