X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=a90598bb3f2da203bf2266d3e7ec0b9091d9351f;hb=af10cd512a39605d9721ad0347ff9734ba56e6d5;hp=98ada98756e1df72592398d50152cf1f02886824;hpb=b543fd82d2d9a3426f72e8211506ea7c7f368be4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 98ada9875..a90598bb3 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Apr 30 07:24:18 CEST 2019
+Tue Jan 14 07:24:53 CET 2020