X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=83100d90ea3c18789399f5a86f38b4bede3be14a;hb=d5b57690b5458f5d16125997d68a49527c86fd84;hp=1defbff2760f7026bc6ffe09a6d253be67bb592c;hpb=94cd32389004162a325b9e08cfb39bbae156eb0e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index 1defbff27..83100d90e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Sep 13 21:26:35 CEST 2013
+Fri Feb 14 12:12:04 CET 2014