X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.tx%2Fmerge-base;h=3deea699e07ef4dc07dcebab404c926355ed0bf2;hp=41092cd207969cced37b65c1e2d544ba5069c3e5;hb=eddb4be333a2870dfeddd78ba8467e90cc867d09;hpb=7bcb3a89b3271e018da4d92437dc5ba125ea8698

diff --git a/.tx/merge-base b/.tx/merge-base
index 41092cd207..3deea699e0 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Mon Dec 28 22:25:00 CET 2015
+Tue Mar  7 19:43:03 CET 2017