X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=43a0cc647b2c14bac68ef161f1a13720eb115415;hb=d18c141d416cd49d77fa4612aef246e6e7c86e57;hp=0e3c61613bb55ac30cc474cab3c3c640ce25adab;hpb=4ea1ef8cc9a641209ded60d5045ac3cf25be242e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 0e3c61613b..43a0cc647b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Jul 12 07:24:40 CEST 2019
+Sun Nov 10 07:24:29 CET 2019