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

diff --git a/.tx/merge-base b/.tx/merge-base
index d03c707af..09536e989 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue May 10 21:52:13 CEST 2016
+Mon May 22 07:24:10 CEST 2017