X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=8465278c42532c1552876892d696fcf4cad5788a;hb=2ec2623bc6da85a7ac9f34a1e5d845a92fb0f18d;hp=3a34f2b81bec754eb41f2676daec2210cd05a534;hpb=0466008d0071edabe36ce8896c9090003b37277f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3a34f2b81..8465278c4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Dec 16 07:25:19 CET 2018
+Thu Dec 20 07:24:05 CET 2018