X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=d03c707af970540f1b97e8909029f4fb086f3843;hb=74cebbb48d9481bb83eccb4438283f319352cb74;hp=cd53b6c9fab9227ddd1dfe27201e2535bf4f177a;hpb=8d10ea819c27736320d03e75134af341f8127199;p=xonotic%2Fxonotic-data.pk3dir.git

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