X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a73edd9b09c1d382e82a78349f2295a1dbbbd4e6;hb=1b66e7bf8e5f47da8a022b491ad4f243c5168b79;hp=5536a9d59815ca8ae4e28ac7472980fd5ca5a9e1;hpb=eafa105d2337fe62cd1d4db2ac831b06a591b454;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 5536a9d59..a73edd9b0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Apr  6 07:23:36 CEST 2017
+Sat Jun  3 07:23:47 CEST 2017