X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hb=9e84ff8daa3826ef32e2891a7c5224a7cd436d23;hp=41092cd207969cced37b65c1e2d544ba5069c3e5;hpb=f41d9f31538bef0259d2b2c74536bb977901f99d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd20..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Tue May 10 21:52:13 CEST 2016