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

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