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

diff --git a/.tx/merge-base b/.tx/merge-base
index 67a023d4c..ee1c42f13 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Sep 12 07:24:50 CEST 2019
+Sat Oct  5 07:24:30 CEST 2019