X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=5c250465b31a4c606b7031e5babeb408110e8f24;hb=37e404b90ba91c995eea11bc8227e0d5aef510c1;hp=6b9bef88e8973e712d8c855c7bfa7228018d7e95;hpb=8b7d07cc724c130cb61a8b32099b01b26a418149;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 6b9bef88e..5c250465b 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Mar 29 07:24:37 CEST 2020
+Mon Aug  3 07:23:42 CEST 2020