X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hb=26693a3ac060825ce6c7f170d4e65f7ac2a1fb25;hp=b0c891bbe5a7864b64d51f6a4f719d66c54d03ac;hpb=120ad19fdf46b7096a0f90b940e590f1909ad22c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index b0c891bbe..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Aug 31 21:02:59 CEST 2015
+Tue May 10 21:52:13 CEST 2016