X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=22fa57672fa542f7e727a3c4d319d08c2daf081b;hb=4cec650452119aa747101865fd6c7b793b182f57;hp=15b91cc93beaedd2dc0962e3c2d06f6a8b1b5c14;hpb=3c08700f00a014d84ffe1bb64305ca5da7594cea;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 15b91cc93..22fa57672 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Apr  8 07:24:18 CEST 2020
+Thu Aug 20 07:23:42 CEST 2020