X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=67a023d4c8fb61a4e1b494e3b59c6d9a00a4f553;hb=d8e73f411f306e6d475bf385bfe5777692aee4a0;hp=87d4e9aa2f08e869d25154c89e22c3a7d6e401ec;hpb=a970792ed2a2fdeb8742bafeea321e86790408cb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 87d4e9aa2..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 29 07:24:13 CET 2019
+Thu Sep 12 07:24:50 CEST 2019