X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=ee1c42f130f95c11c9d6f5580dd3488d9627375b;hp=4b64ea073cc7e8ffe7ef2f5f159190eacb7af617;hb=dcf0b374112657ffd3645d8ae20216c2f0e142b7;hpb=a2ffc9f0592984179393089c7b740d851df5dac5

diff --git a/.tx/merge-base b/.tx/merge-base
index 4b64ea073..ee1c42f13 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 07:24:32 CEST 2019
+Sat Oct  5 07:24:30 CEST 2019