X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=.tx%2Fmerge-base;h=41092cd207969cced37b65c1e2d544ba5069c3e5;hb=e0052f4a45840806e5896ac1c42919773a65b17c;hp=aaade5f752afc2314c43225e618bd799b63a3022;hpb=12e23132497ee2f6ebe5d7b77cef7f9cba0bb55c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/.tx/merge-base b/.tx/merge-base
index aaade5f75..41092cd20 100644
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Jan 13 19:44:31 CET 2015
+Mon Dec 28 22:25:00 CET 2015