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

diff --git a/.tx/merge-base b/.tx/merge-base
index c5444073c..e43a3376b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Wed Jun 10 07:23:47 CEST 2020
+Thu Dec 10 07:23:45 CET 2020