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

diff --git a/.tx/merge-base b/.tx/merge-base
index db68ce747..ee0ac25b5 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:18:19 CEST 2015
+Sat May 20 07:24:00 CEST 2017