X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=.tx%2Fmerge-base;h=e3a430503d3dfa068c7d76cc4b09f965018013f9;hb=1fb017b89bbc938724d3031cac755ae3e307f35f;hp=99d127cbd61dbcc4cf809204e97c02d821d74f9e;hpb=f17750f1a748960a2ed79995a4ddb5767f47e8b5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 99d127cbd..e3a430503 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jun  6 07:23:41 CEST 2020
+Sun Jun  7 07:24:59 CEST 2020