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

diff --git a/.tx/merge-base b/.tx/merge-base
index e04ca270e..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Aug 20 19:16:47 CEST 2015
+Tue May 10 21:52:13 CEST 2016