X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=be37ea91fb3bbd1a6fa4f0b70b32d1ea95343ad4;hp=afd42183adad9cf255205fceb4e6719f9ee2da59;hpb=f86c22330ca4e92429ec4e37972947899542e6ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index afd42183a..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon May  6 07:24:29 CEST 2019
+Thu Sep 12 07:24:50 CEST 2019