X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=ee0ac25b5697589d6ce7d166acc0cfb0ae65048b;hb=fdb0418bbc2d6d15c42f8bf7beb85a61ab791b65;hp=3deea699e07ef4dc07dcebab404c926355ed0bf2;hpb=cd60b2d7d720d0ccc580eecd3abf2a4768092aba;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 3deea699e..ee0ac25b5 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  7 19:43:03 CET 2017
+Sat May 20 07:24:00 CEST 2017