X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=94ecb457b816678a95db4e9131c3c98dcc6f64d9;hp=59377548dbc3879b865d58416167a7f2c8e1dcf7;hb=fc1875c59f5b196a0f06693eabb322b849b07a43;hpb=22e8d4dc45e799cdac563385a6562c5a204b7154

diff --git a/.tx/merge-base b/.tx/merge-base
index 59377548db..94ecb457b8 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Apr 22 07:24:17 CEST 2019
+Sun Apr 28 07:25:31 CEST 2019