X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=7ec08f73661d5c1504e116996cedbfb539dbeeb0;hb=7be0877c0f6578563a106a541357647b888ea1da;hp=07d09242df758f4e5819a9b8992ebe2f6ce957b3;hpb=3146ed7a0c5355661e2ff30db6dbaca1b4a22eb0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 07d09242d..7ec08f736 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jun 25 07:24:50 CEST 2019
+Sat May  9 07:23:55 CEST 2020