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

diff --git a/.tx/merge-base b/.tx/merge-base
index 40970e2c1..d03c707af 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Oct 13 21:13:27 CEST 2015
+Tue May 10 21:52:13 CEST 2016