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

diff --git a/.tx/merge-base b/.tx/merge-base
index 390d38fad..22fa57672 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun  3 07:23:37 CEST 2020
+Thu Aug 20 07:23:42 CEST 2020