X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=c4f4715ed5da0500fefe3ede6cc3a265de734b62;hp=df5f27c1baedba93172f925a324e6ccc1995d9de;hb=36aba23c89a9046509b2674e3cf9f93a82dbaf22;hpb=106a9b450d6470f9472d479c9bb6d784cfaeb90e

diff --git a/.tx/merge-base b/.tx/merge-base
index df5f27c1b..c4f4715ed 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Dec 28 07:24:50 CET 2019
+Sun Feb 16 07:24:24 CET 2020