X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=1bafc5c83e378fd9504d6b661cb2217cbdb2c3a3;hb=bc2035b7d1d47f8987e7e3a923b786c0a2021c58;hp=de1b13bbc4bbd2a4a0a99a0aa88b1f9d9c69f101;hpb=09a8b30f680601a2ee7f897dfb8e8662ca6d2d4e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index de1b13bbc..1bafc5c83 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sun Oct  6 07:24:28 CEST 2019
+Mon Feb 17 07:24:21 CET 2020