X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=df5f27c1baedba93172f925a324e6ccc1995d9de;hb=27bc18f43e9d09ffa55bca593e48e69c2c734d15;hp=3d55aa93ad7e860dbd3be679d000b35d8d9710c1;hpb=cf9256c2a1ee5b636d56ea39dab6dd2c13fbbf31;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3d55aa93a..df5f27c1b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Jul  7 07:25:26 CEST 2019
+Sat Dec 28 07:24:50 CET 2019