X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=21290326ab5406151c6b2944741c78b0feeb08c9;hb=3de25c766ed8b827c8a51093dacad56e0596fe48;hp=b23510e717f7147ba5dad1f1788ecc23bdddc451;hpb=e0b2f99877bd9c74f5774f6ce3d1f6a9160a68e5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b23510e71..21290326a 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Aug 28 07:24:14 CEST 2018
+Sun Dec 23 07:25:23 CET 2018