X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=c0ddb1d5fcf165824eec0aa7cb56ef6d8153110a;hp=3deea699e07ef4dc07dcebab404c926355ed0bf2;hb=0f1ffe9c0565f1f1a0d6f58240760f227aa3ee99;hpb=5fb2f3c4e123910e6291d6337fadd61f5199f5a5

diff --git a/.tx/merge-base b/.tx/merge-base
index 3deea699e..c0ddb1d5f 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Mar  7 19:43:03 CET 2017
+Wed Feb 14 07:23:42 CET 2018