X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=c0c56123893d77228a0ff721ec4ec85a9937cf68;hb=ee295457fceb01845c5496d476e2aaef571fccc2;hp=12e22e55744578d3ad8135aac71ec33813f92f0e;hpb=ba7c5c7aa1351282377f6c4afc4653a130409255;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 12e22e557..c0c561238 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Sep  2 07:24:05 CEST 2018
+Mon May 20 07:24:21 CEST 2019