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

diff --git a/.tx/merge-base b/.tx/merge-base
index fd366f8eb..83100d90e 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Fri Oct  4 13:06:47 CEST 2013
+Fri Feb 14 12:12:04 CET 2014