X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=0e82268d6526270d46f35ead73425fac23788b4b;hb=ac7deb97b1a0e73ceea4684be73e72912fb3f1aa;hp=8e5f2c73fc107746321a4462e83e1be4a1ff69e6;hpb=f8d356f8eb49655dc63000bec33637b6f7aa6ffa;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 8e5f2c73f..0e82268d6 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Aug  1 07:23:42 CEST 2020
+Mon Mar  1 07:23:49 CET 2021