X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=e43a3376bd7c9ce501c55180aba6ee526dcae448;hb=7f8c19051dadd84ab83cc4eacec6c18c402b9c52;hp=35c8b68c6c7dbc1b6e4819a8915f4fea25bb6b98;hpb=2885a7d677e3423b5896d5c446927436ed5fe7f9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 35c8b68c6..e43a3376b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Thu Jul 16 07:23:56 CEST 2020
+Thu Dec 10 07:23:45 CET 2020