X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=f60d2b8f88b73fa9b90c0e97acacb0922b866b6e;hb=9f777263565764e8cbc59ed3cf66ceb780633a79;hp=efe8262cb690e24a55eb2e0ea36348e8f7685b5d;hpb=ad8157299fe0c49d2e19a4f61ec2d0dda94be88e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index efe8262cb6..f60d2b8f88 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Sat Jul  8 07:24:47 CEST 2017
+Mon Mar  5 07:23:48 CET 2018