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

diff --git a/.tx/merge-base b/.tx/merge-base
index 1e1b6f91c..67a023d4c 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Feb 23 07:24:14 CET 2019
+Thu Sep 12 07:24:50 CEST 2019