X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=09536e9897c4e9f7880b489c2c70ca60ab2e9a76;hb=05e3807aba750351f5606bca088bf630bc80dcdb;hp=41092cd207969cced37b65c1e2d544ba5069c3e5;hpb=9523ac901729421b9bf24bb74e5e3453a49c476e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd20..09536e989 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Mon May 22 07:24:10 CEST 2017