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

diff --git a/.tx/merge-base b/.tx/merge-base
index 12e22e557..8465278c4 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep  2 07:24:05 CEST 2018
+Thu Dec 20 07:24:05 CET 2018